Update master branch with v1.0 changes from 1.0 branch

Grab release notes, changelog, and version changes so master is
up to date.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>

4 files changed, 137 insertions, 2 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2d7ca6cbf..b8b475362 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,43 @@
 # Release Notes
 
+## 1.0.0
+### Features
+- The `podman exec` command now includes a `--workdir` option to set working directory for the executed command
+- The `podman create` and `podman run` commands now support the `--init` flag to use a minimal init process in the container
+- Added the `podman image sign` command to GPG sign images
+- The `podman run --device` flag now accepts directories, and will added any device nodes in the directory to the container
+- Added the `podman play kube` command to create pods and containers from Kubernetes pod YAML
+
+### Bugfixes
+- Fixed a bug where passing `podman create` or `podman run` volumes with an empty host or container path could cause a segfault
+- Fixed a bug where `storage.conf` was sometimes ignored for rootless containers
+- Fixed a bug where Podman run as root would error if CAP_SYS_RESOURCE was not available
+- Fixed a bug where Podman would fail to start containers after a system restart due to an out-of-date default Apparmor profile
+- Fixed a bug where Podman's bash completions were not working
+- Fixed a bug where `podman login` would use existing login credentials even if new credentials were provided
+- Fixed a bug where Podman could create some directories with the wrong permissions, breaking containers with user namespaces
+- Fixed a bug where `podman runlabel` was not properly setting container names when the `--name` was specified
+- Fixed a bug where `podman runlabel` sometimes included extra spaces in command output
+- Fixed a bug where `podman commit` was including invalid port numbers in created images when committing containers with published ports
+- Fixed a bug where `podman exec` was not honoring the container's environment variables
+- Fixed a bug where `podman run --device` would fail when a symlink to a device was specified
+- Fixed a bug where `podman build` was not properly picking up OCI runtime paths specified in `libpod.conf`
+- Fixed a bug where Podman would mount `/dev/shm` into the container read-only for read-only containers (`/dev/shm` should always be read-write)
+- Fixed a bug where Podman would ignore any mount whose container mountpoint was `/dev/shm`
+- Fixed a bug where `podman export` did not work with the default `fuse-overlayfs` storage driver
+- Fixed a bug where `podman inspect -f '{{ json .Config }}'` on images would not output anything (it now prints the image's config)
+- Fixed a bug where `podman rmi -fa` displayed the wrong error message when trying to remove images used by pod infra containers
+
+### Misc
+- Rootless containers now unconditionally use postrun cleanup processes, ensuring resources are freed when the container stops
+- A new version of Buildah is included for `podman build`, featuring improved build speed and numerous bugfixes
+- Pulling images has been parallelized, allowing individual layers to be pulled in parallel
+- The `podman start --attach` command now defaults the `sig-proxy` option to `true`, matching `podman create` and `podman run`
+- The `podman info` command now prints the path of the configuration file controlling container storage
+- Added `podman list` and `podman ls` as aliases for `podman ps`, and `podman container ps` and `podman container list` as aliases for `podman container ls`
+- Changed `podman generate kube` to generate Kubernetes service YAML in the same file as pod YAML, generating a single file instead of two
+- To improve compatability with the Docker command line, `podman inspect -f '{{ json .ContainerConfig }}'` on images is no longer valid; please use `podman inspect -f '{{ json .Config }}'` instead
+
 ## 0.12.1.2
 ### Bugfixes
 - Fixed a bug where an empty path for named volumes could make it impossible to create containers
diff --git a/changelog.txt b/changelog.txt
index b0680a02c..8ee11cdc4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,100 @@
+- Changelog for v1.0.0 (2018-1-11)
+  * Update release notes for v1.0
+  * Remove clientintegration from Makefile
+  * Regenerate EasyJSON to fix JSON issues
+  * Update gitvalidation to avoid reverts w/o signoffs
+  * Cirrus: Post-Merge Testing for v1.0 Branch
+  * Move python code from contrib to it's own repo python-podman
+  * Use defaults if paths are not specified in storage.conf
+  * (Minor) Cirrus: Print timestamp at start
+  * fix up sigstore path
+  * Trivial readme updates
+  * podman: bump RLIMIT_NOFILE also without CAP_SYS_RESOURCE
+  * Fix handling of nil volumes
+  * sign: make all error messages lowercase
+  * sign: use filepath.Join instead of fmt.Sprintf
+  * createconfig: always cleanup a rootless container
+  * Fix 'image trust' from PR1899
+  * libpod/image: Use ParseNormalizedNamed in RepoDigests
+  * apparmor: apply default profile at container initialization
+  * Fix up image sign and trust
+  * List the long variant of each option before its shorter counterpart
+  * Use existing interface to request IP address during restore
+  * Added checkpoint/restore test for same IP
+  * Enable checkpoint test with established TCP connections
+  * .github/ISSUE_TEMPLATE: Suggest '/kind bug' and '/kind feature'
+  * pkg/hooks/exec: Include failed command in hook errors
+  * hooks/exec/runtimeconfigfilter: Log config changes
+  * hooks: Add pre-create hooks for runtime-config manipulation
+  * Add Validate completions
+  * Add a --workdir option to 'podman exec'
+  * Default --sig-proxy to true for 'podman start --attach'
+  * Test that 'podman start --sig-proxy' does not work without --attach
+  * [WIP]Support podman image sign
+  * vendor latest buildah
+  * Honor image environment variables with exec
+  * Minor: Remove redundant basename command in ooe.sh
+  * Rename libpod.Config back to ContainerConfig
+  * Add ability to build golang remote client
+  * vendor latest buildah
+  * Add the configuration file used to setup storage to podman info
+  * podman: set umask to 022
+  * podman-login: adhere to user input
+  * Vendor in latest containers/buildah code
+  * Readd Python testing
+  * Update vendor of runc
+  * [skip ci] Docs: Add Bot Interactions section
+  * container runlabel NAME implementation
+  * Bump time for build_each_commit step
+  * add container-init support
+  * If local storage file exists, then use it rather then defaults.
+  * vendor in new containers/storage
+  * Fix completions
+  * Touch up some troubleshooting nits
+  * Log container command before starting the container
+  * Use sprintf to generate port numbers while committing
+  * Add troubleshooting for sparse files
+  * Fix handling of symbolic links
+  * podman build is not using the default oci-runtime
+  * Re-enable checkpoint/restore CI tests on Fedora
+  * Fixes to handle /dev/shm correctly.
+  * rootless tests using stop is more reliable
+  * Allow alias for list, ls, ps to work
+  * Refactor: use idtools.ParseIDMap instead of bundling own version
+  * cirrus: Use updated images including new crui
+  * Switch all referencs to image.ContainerConfig to image.Config
+  * Allow users to specify a directory for additonal devices
+  * Change all 'can not' to 'cannot' for proper usage
+  * Invalid index for array
+  * Vendor in latest psgo code to fix race conditions
+  * test: add test for rootless export
+  * export: fix usage with rootless containers
+  * rootless: add function to join user and mount namespace
+  * libpod: always store the conmon pid file
+  * Use existing CRIU packages in CI setup
+  * skip test for blkio.weight when kernel does not support it
+  * Add Play
+  * Cirrus: Skip build all commits test on master
+  * prepare for move to validate on 1.11 only
+  * [skip ci] Gate: Update docs w/ safer local command
+  * Support podman image trust command
+  * Makefile: validate that each commit can at least build
+  * perf test a stress test to profile CPU load of podman
+  * all flakes must die
+  * Add information on --restart
+  * generate service object inline
+  * Cirrus: One IRC notice only
+  * docs/tutorials: add a basic network config
+  * display proper error when rmi -fa with infra containers
+  * add --get-login command to podman-login.
+  * Show image only once with images -q
+  * Add script to create CI VMs for debugging
+  * Cirrus: Migrate PAPR testing of F28 to Cirrus
+  * Skip checkpoint tests on Fedora <30
+  * Cirrus: Add text editors to cache-images
+  * Clean up some existing varlink endpoints
+  * mount: allow mount only when using vfs
+
 - Changelog for v0.12.1.2 (2018-12-13)
   * Add release notes for 0.12.1.2
   * runlabel should sub podman for docker|/usr/bin/docker
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 16cf01976..bf75522dc 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -39,7 +39,7 @@
 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
 
 Name: podman
-Version: 0.12.2
+Version: 1.0.1
 Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
diff --git a/version/version.go b/version/version.go
index 45dc93d91..ea5a92286 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,4 +4,4 @@ package version
 // NOTE: remember to bump the version at the top
 // of the top-level README.md file when this is
 // bumped.
-const Version = "0.12.2-dev"
+const Version = "1.0.1-dev"