Bump to v0.11.1.1v0.11.1.1

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

3 files changed, 31 insertions, 2 deletions

diff --git a/changelog.txt b/changelog.txt
index 9aaec0e74..7b0f0f3af 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,32 @@
+- Changelog for v0.11.1.1 (2018-11-15)
+  * Vendor in containers/storage
+  * Add release notes for 0.11.1.1
+  * Increase pidWaitTimeout to 60s
+  * Cirrus: Add master branch testing status badge
+  * rootless: call IsRootless just once
+  * Bump golang to v1.10 in install.md
+  * Standardized container image for gofmt and lint
+  * Make list of approvers same as reviewers
+  * vendor: update ostree-go
+  * vendor.conf: fix typo
+  * Cleanup podman spec to not show git checkout is dirty
+  * Add space between num & unit in images output
+  * Update troubleshooting guide to deal with rootless path
+  * troubleshooting.md: add a recipe for rootless ping
+  * remove $-prefix from (most) shell examples
+  * docs: Fix duplicated entry for pod-container-unmount
+  * Better document rootless containers
+  * info: add rootless field
+  * Accurately update state if prepare() partially fails
+  * Do not hide errors when creating container with UserNSRoot
+  * rm -f now removes a paused container
+  * correct assignment of networkStatus
+  * podman_tutorial: cni build path has changed
+  * Bump gitvalidation epoch
+  * Bump to v0.11.2-dev
+  * Cirrus: Ignore any error from the IRC messenger
+  * rootless: default to fuse-overlayfs when available
+
 - Changelog for v0.11.1 (2018-11-08)
   * Update release notes for 0.11.1
   * update seccomp.json
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 3192cbfed..97d01ba84 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.11.2
+Version: 0.11.1.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 01b9b7a8d..52f2aed9e 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.11.2-dev"
+const Version = "0.11.1.1"