17 files changed, 229 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 03e21cbe1..1f4a7f6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GO ?= go
 DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 1c45b42e9ff972d9645735118635e4186e6411f8
+EPOCH_TEST_COMMIT ?= 7b7397481960c85379d8eb1ed21e76da2ce8a4fc
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 7db579f3a..92a17f8d0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,208 @@
+- Changelog for v1.2.0 (2019-03-30)
+  * Update release notes for v1.2.0
+  * Remove wait event
+  * Vendor Buildah 1.7.2
+  * Add locking to ensure events file is concurrency-safe
+  * Alter container/pod/volume name regexp to match Docker
+  * test: test that an unprivileged user cannot access the storage
+  * userns: do not use an intermediate mount namespace
+  * volumes: push the chown logic to runtime_volume_linux.go
+  * Cleanup image2 -> image for imports
+  * Set blob cache directory based on GraphDriver
+  * utils: call GetRootlessRuntimeDir once
+  * rootless: set sticky bit on rundir
+  * oci: drop reference to runc
+  * Fix lint
+  * Ensure that we make a netns for CNI non-default nets
+  * rootless: change env prefix
+  * vendor buildah, image, storage, cni
+  * Default to SELinux private label for play kube mounts
+  * Add watch mode to podman ps
+  * Add all container status states to the podman-ps manual page.
+  * fix bug `system df` add blank space to the output
+  * fix bug remote-podman images --digests
+  * Use spaces instead of tab for JSON marshal indent
+  * Fix gofmt
+  * Remove ulele/deepcopier in favor of JSON deep copy
+  * doc: add note that pod publish ports are static once defined
+  * Sigh; disable pod-top test, it's unreliable (#2780)
+  * Resolve review comments
+  * Add a test that --add-host conflicts with --no-hosts
+  * Add manpages and completions for dns=none and no-hosts
+  * Add --no-hosts flag to disable management of /etc/hosts
+  * Add for --dns=none to disable creation of resolv.conf
+  * Add support to disable creation of network config files
+  * system df: reject invalid arguments
+  * rootless: fix regression when using exec on old containers
+  * Touchup commands.md
+  * size is optional for container inspection
+  * Add three test cases for podman attach test
+  * system df to show podman disk usage
+  * Add "died" event
+  * docs/podman-pod-create.1.md: add example with port mapping
+  * podman health check phase3
+  * userns: use the intermediate mountns for volumes
+  * volume: create new volumes with right ownership
+  * utils: drop dead function
+  * troubleshooting: explain setup user: invalid argument
+  * Cirrus: Verify manpages for all subcommands exist
+  * Make "stopped" a valid state that maps to "exited"
+  * fix Bug 1688041-podman image save removes existing image
+  * podman: do not split --env on comma
+  * Need to pass the true paramater with --syslog in cobra
+  * Fix man page to mention race condition
+  * docs/podman-run.1.md: remove extra whitespace in --read-only
+  * man pages - consistency fixes
+  * Add new key and never-expiring test certificate
+  * Cirrus: Run vendor check in parallel
+  * Cirrus: Various fixes for rootless testing
+  * ps: fix segfault if the store is not initialized
+  * tests: re-enable some tests for rootless mode
+  * rootless: implement pod restart
+  * rootless: reimplement restart with rootless.Argument()
+  * test: fix SkipIfRootless() helper
+  * rootless, rm: fix retcode when the container is not found
+  * rootless: fix ps command
+  * rootless: fix pod kill
+  * Enable rootless integration tests
+  * BATS: new tests, and improvements to existing ones
+  * podman umount: error out if called with no args
+  * Export ConmonPidFile in 'podman inspect' for containers
+  * support GO template {{ json . }}
+  * Incorporate user from image inspect data in play kube
+  * Cirrus: Disable master-success IRC notices
+  * Cleanup messages on podman load
+  * Cirrus: Update VM Cache images
+  * podman logs on created container should exit
+  * Fix cut and paste errors in podman-pod-inspect
+  * rootless: fix pod top
+  * pod: fix segfault when there are no arguments to inspect
+  * output of port grouping in ps command added as example
+  * utils: split generation and writing of storage.conf
+  * Cirrus: Fix post-merge failure notice
+  * utils: avoid too long tmp directory
+  * podman image tree: fix usage message
+  * Cirrus: Notify on IRC if post-merge testing fails
+  * rootless: change default path for conmon.pid
+  * Add CLI storage conf example to run manpage
+  * Integration test tweaks
+  * display logs for multiple containers at the same time
+  * Make 'podman rm' exit with 125 if it had a bogus & a running container
+  * rootless: write the custom config file before reload
+  * Add support for SCTP port forwarding
+  * Make sure buildin volumes have the same ownership and permissions as image
+  * rootless: do not override user settings
+  * runtime: refactor NewRuntime and NewRuntimeFromConfig
+  * events: use os.SEEK_END instead of its value
+  * container: check containerInfo.Config before accessing it
+  * rootless: use Geteuid instead of Getuid
+  * rootless: use /tmp/libpod-rundir-$EUID for fallback
+  * build: fix build DIR -t TAG
+  * testcase added for listing range of ports in ps command
+  * port grouping in ps command output
+  * Update pull and pull-always in bud man page
+  * cirrus: upgrade slirp4netns
+  * rootless: fix CI regression when using slirp4netns
+  * save-load-export: clear cli-parsing default
+  * Bump timeout on a podman info test to default
+  * Replace skopeo-containers with containers-common
+  * slirp4netns: use --disable-host-loopback
+  * slirp4netns: set mtu to 65520
+  * Tree implementation for podman images
+  * Replace buildah with podman in build doc
+  * zsh completion
+  * Usage messages: deduplicate '(default true)' et al
+  * Corrected detach man pages and code comments
+  * Add --replace flag to "podman container runlabel"
+  * rm: fix cleanup race
+  * Add gating tasks
+  * Add 'podman events' to podman(1)
+  * Vendor docker/docker, fsouza and more #2
+  * Usability cleanup for 'inspect'
+  * Add event on container death
+  * Update vendor of Buildah and imagebuilder
+  * minor typo fix in 'podman top' usage
+  * healtcheck phase 2
+  * Add event logging to libpod, even display to podman
+  * Fix SELinux on host shared systems in userns
+  * Fix broken link in io.podman.varlink
+  * move formats pkg to and vendor from buildah
+  * Ensure that tmpfs mounts do not have symlinks
+  * Update troubleshooting guide for Podman-in-Podman
+  * Buffer stdin to a file when importing "-"
+  * vendor psgo v1.2
+  * preparation for remote-client create container
+  * Initialize field in InfoHost struct
+  * rootless: allow single mappings
+  * Remove --rm and --detach don't coexist note
+  * rootless: fix pod stop|rm if uid in the container != 0
+  * rootless: fix rm when uid in the container != 0
+  * rootless: disable pod stats
+  * rootless: do not create automatically a userns for pod kill
+  * rootless: support a custom arg to the new process
+  * slirp4netns: add builtin DNS server to resolv.conf
+  * errors: fix error cause comparison
+  * libpod: allow to configure path to the network-cmd binary
+  * build: honor --net
+  * pull: promote debug statement to error
+  * Fix generation of infra container command
+  * Remove an unused if statement I added
+  * Don't delete another container's resolv and hosts files
+  * Fix a potential segfault during infra container create
+  * We don't use crio-umount.conf
+  * Move secrets package to buildah
+  * Add troublshoot information about SELinux labeling of containers/storage
+  * test docs fixups
+  * Default to image entrypoint for infra container
+  * ginkgo status improvements
+  * rootless: propagate errors from info
+  * podman play kube defaults
+  * container runlabel respect $PWD
+  * Remove 'podman ps' restarting filter and fix stopped
+  * label parsing in non-quoted field
+  * More cleanup for failures on missing commands.
+  * add podman-healthcheck(1) to podman(1)
+  * Implement review feedback
+  * new system tests under BATS
+  * fix bug in podman images list all images with same name
+  * Fix help commands to show short and long description.
+  * implement showerror and accept HOST_PORT env which defaults to 8080
+  * create: join also the mount ns of the dependency
+  * rootless: exec join the user+mount namespace
+  * oci: make explicit the extra files to the exec
+  * add test to cover networking
+  * tests to cover locks and parallel execution #2551
+  * Yet another seemingly minor tweak to usage message
+  * Change LookupContainer logic to match Docker
+  * Implement podman-remote wait command and container subcommand
+  * Cirrus: Use imgts container to record metadata
+  * System-test: Documentation and TODO list
+  * podman-remote pod top|stats
+  * fix bug --device enable specifying directory as device
+  * add flag --extract tar file in podman cp
+  * Fix incorrect pod create failure
+  * libpod/container_internal: Split locale at the first dot, etc.
+  * Add volume mounting to podman play kube
+  * podman healthcheck run (phase 1)
+  * Append hosts to dependency container's /etc/hosts file
+  * rootless: fix clone syscall on s390 and cris archs
+  * Cirrus: Add dedicated rootless mode testing
+  * rootless: fill in correct storage conf default
+  * rm: set exit code to 1 if a specified container is not found
+  * Support filter image by reference to the repo name
+  * Bump gitvalidation epoch
+  * Bump to v1.2.0-dev
+  * Support podman-remote kill container(s)
+  * cirrus: Drop ginkgo, gomega, easyjson install
+  * Cirrus: Stop testing on RHEL
+  * Cirrus: Stop testing on RHEL
+  * Globally increase test timeout to 90-minutes
+  * cirrus: Drop ginkgo, gomega, easyjson install
+  * Cirrus: Add BATS package for all platforms
+  * Globally increase test timeout to 90-minutes
+  * exec: support --preserve-fds
+  * get_ci_vm.sh: Fix conflicting homedir files
+
 - Changelog for v1.1.2 (2019-03-04)
   * Fix #2521
   * Update release notes for v1.1.2
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 319bbe979..396304f8d 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: 1.2.0
+Version: 1.3.0
 Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
diff --git a/docs/podman-container-checkpoint.1.md b/docs/podman-container-checkpoint.1.md
index 666dbbb80..79dc12261 100644
--- a/docs/podman-container-checkpoint.1.md
+++ b/docs/podman-container-checkpoint.1.md
@@ -10,7 +10,7 @@ podman\-container\-checkpoint - Checkpoints one or more running containers
 Checkpoints all the processes in one or more containers. You may use container IDs or names as input.
 
 ## OPTIONS
-**-k**, **--keep**
+**--keep**, **-k**
 
 Keep all temporary log and statistics files created by CRIU during checkpointing. These files
 are not deleted if checkpointing fails for further debugging. If checkpointing succeeds these
diff --git a/docs/podman-container-restore.1.md b/docs/podman-container-restore.1.md
index e47d585cc..e41f7c1d8 100644
--- a/docs/podman-container-restore.1.md
+++ b/docs/podman-container-restore.1.md
@@ -10,7 +10,7 @@ podman\-container\-restore - Restores one or more running containers
 Restores a container from a checkpoint. You may use container IDs or names as input.
 
 ## OPTIONS
-**-k**, **--keep**
+**--keep**, **-k**
 
 Keep all temporary log and statistics files created by CRIU during
 checkpointing as well as restoring. These files are not deleted if restoring
diff --git a/docs/podman-container-runlabel.1.md b/docs/podman-container-runlabel.1.md
index 7fa9805e6..39d798804 100644
--- a/docs/podman-container-runlabel.1.md
+++ b/docs/podman-container-runlabel.1.md
@@ -76,11 +76,12 @@ The [username[:password]] to use to authenticate with the registry if required.
 If one or both values are not supplied, a command line prompt will appear and the
 value can be entered.  The password is entered without echo.
 
-**-h** **--help**
+**--help** **-h**
 Print usage statement
 
-**-n** **--name**=""
- Use this name for creating content for the container. NAME will default to the IMAGENAME if it is not specified.
+**--name** **-n**=""
+
+Use this name for creating content for the container. NAME will default to the IMAGENAME if it is not specified.
 
 **--quiet, -q**
 
diff --git a/docs/podman-generate-kube.1.md b/docs/podman-generate-kube.1.md
index b6fa78606..99029be90 100644
--- a/docs/podman-generate-kube.1.md
+++ b/docs/podman-generate-kube.1.md
@@ -5,7 +5,7 @@
 podman-generate-kube - Generate Kubernetes YAML
 
 # SYNOPSIS
-**podman generate kube** [*-s*][*--service*] *container* | *pod*
+**podman generate kube** [*-s*|*--service*] *container* | *pod*
 
 # DESCRIPTION
 **podman generate kube** will generate Kubernetes Pod YAML (v1 specification) from a podman container or pod. Whether
@@ -20,7 +20,8 @@ Note that the generated Kubernetes YAML file can be used to re-run the deploymen
 
 # OPTIONS:
 
-**s** **--service**
+**--service** **-s**
+
 Generate a Kubernetes service object in addition to the Pods.
 
 ## Examples ##
diff --git a/docs/podman-pod-kill.1.md b/docs/podman-pod-kill.1.md
index 2a863d3d9..d617acd66 100644
--- a/docs/podman-pod-kill.1.md
+++ b/docs/podman-pod-kill.1.md
@@ -21,7 +21,7 @@ to run pods such as CRI-O, the last started pod could be from either of those me
 
 The latest option is not supported on the remote client.
 
-**--signal, s**
+**--signal, -s**
 
 Signal to send to the containers in the pod. For more information on Linux signals, refer to *man signal(7)*.
 
diff --git a/docs/podman-pod-pause.1.md b/docs/podman-pod-pause.1.md
index 418a9ee2a..0ed63a7f8 100644
--- a/docs/podman-pod-pause.1.md
+++ b/docs/podman-pod-pause.1.md
@@ -11,7 +11,7 @@ Pauses all the running processes in the containers of one or more pods.  You may
 
 ## OPTIONS
 
-**--all, a**
+**--all, -a**
 
 Pause all pods.
 
diff --git a/docs/podman-pod-rm.1.md b/docs/podman-pod-rm.1.md
index aa26a1bbb..7cd7c26bc 100644
--- a/docs/podman-pod-rm.1.md
+++ b/docs/podman-pod-rm.1.md
@@ -11,7 +11,7 @@ podman\-pod\-rm - Remove one or more pods
 
 ## OPTIONS
 
-**--all, a**
+**--all, -a**
 
 Remove all pods.  Can be used in conjunction with \-f as well.
 
@@ -21,7 +21,7 @@ Instead of providing the pod name or ID, remove the last created pod.
 
 The latest option is not supported on the remote client.
 
-**--force, f**
+**--force, -f**
 
 Stop running containers and delete all stopped containers before removal of pod.
 
diff --git a/docs/podman-pod-stop.1.md b/docs/podman-pod-stop.1.md
index 338e04d67..787c672bd 100644
--- a/docs/podman-pod-stop.1.md
+++ b/docs/podman-pod-stop.1.md
@@ -21,7 +21,7 @@ Instead of providing the pod name or ID, stop the last created pod.
 
 The latest option is not supported on the remote client.
 
-**--timeout, --time, t**
+**--timeout, --time, -t**
 
 Timeout to wait before forcibly stopping the containers in the pod.
 
diff --git a/docs/podman-pod-unpause.1.md b/docs/podman-pod-unpause.1.md
index 1004e09f9..8930fde32 100644
--- a/docs/podman-pod-unpause.1.md
+++ b/docs/podman-pod-unpause.1.md
@@ -11,7 +11,7 @@ Unpauses all the paused processes in the containers of one or more pods.  You ma
 
 ## OPTIONS
 
-**--all, a**
+**--all, -a**
 
 Unpause all pods.
 
diff --git a/docs/podman-port.1.md b/docs/podman-port.1.md
index 020a25d32..5adfae5f3 100644
--- a/docs/podman-port.1.md
+++ b/docs/podman-port.1.md
@@ -11,7 +11,7 @@ List port mappings for the *container* or lookup the public-facing port that is
 
 ## OPTIONS
 
-**--all, a**
+**--all, -a**
 
 List all known port mappings for running containers.  When using this option, you cannot pass any container names
 or private ports/protocols as filters.
diff --git a/docs/podman-rm.1.md b/docs/podman-rm.1.md
index dc1729188..16d4027c9 100644
--- a/docs/podman-rm.1.md
+++ b/docs/podman-rm.1.md
@@ -13,11 +13,11 @@ podman\-container\-rm (podman\-rm) - Remove one or more containers
 
 ## OPTIONS
 
-**--all, a**
+**--all, -a**
 
 Remove all containers.  Can be used in conjunction with -f as well.
 
-**--force, f**
+**--force, -f**
 
 Force the removal of running and paused containers.  Forcing a containers removal also
 removes containers from container storage even if the container is not known to podman.
@@ -32,7 +32,7 @@ The latest option is not supported on the remote client.
 
 **--volumes, -v**
 
-Remove the volumes associated with the container. (Not yet implemented)
+Remove the volumes associated with the container.
 
 ## EXAMPLE
 Remove a container by its name *mywebserver*
diff --git a/docs/podman-volume-inspect.1.md b/docs/podman-volume-inspect.1.md
index c22c80bb7..88cc3cf3e 100644
--- a/docs/podman-volume-inspect.1.md
+++ b/docs/podman-volume-inspect.1.md
@@ -15,7 +15,7 @@ existing volumes, use the **--all** flag.
 
 ## OPTIONS
 
-**-a**, **--all**=""
+**-a**, **--all**
 
 Inspect all volumes.
 
diff --git a/docs/podman-wait.1.md b/docs/podman-wait.1.md
index 2d145527b..ed5e11ac7 100644
--- a/docs/podman-wait.1.md
+++ b/docs/podman-wait.1.md
@@ -17,7 +17,7 @@ After the container stops, the container's return code is printed.
 
   Print usage statement
 
-**--interval, i**"
+**--interval, -i**"
   Microseconds to wait before polling for completion
 
 **--latest, -l**
diff --git a/version/version.go b/version/version.go
index 89b5fbd8b..29a576317 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,7 +4,7 @@ package version
 // NOTE: remember to bump the version at the top
 // of the top-level README.md file when this is
 // bumped.
-const Version = "1.2.0-dev"
+const Version = "1.3.0-dev"
 
 // RemoteAPIVersion is the version for the remote
 // client API.  It is used to determine compatibility