Merge branch 'bump_to_v1.11.2.12.ict' into 'IT-1.11.2'

Bump to v1.11.2.12.ict Add empty-image tools to project Signed-off-by: Lei Jitang <leijtiang@huawei.com> See merge request docker/docker!268
liusdu · Feb 13, 2017 · e64c453 · e64c453
2 parents ab6b1c0 + e7756ee
commit e64c453
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG-huawei.md b/CHANGELOG-huawei.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.11.2.12.ict (2017-02-13)
+
++ Add empty image tools(empty-image.sh) to project (mr 265)
+
 ## v1.11.2.11.ict (2017-02-07)
 
 + Add support for building rpm on CentOS 7.2 (mr 249)

diff --git a/VERSION-UNICORN b/VERSION-UNICORN
@@ -1 +1 @@
-1.11.2.11.ict
+1.11.2.12.ict
diff --git a/hack/make/.build-rpm/docker-engine-euleros.spec b/hack/make/.build-rpm/docker-engine-euleros.spec
@@ -1,5 +1,5 @@
-%global _version 1.11.2.11.ict
-%global _release 0.0.20170207.005653.git999f7a5
+%global _version 1.11.2.12.ict
+%global _release 0.0.20170213.005653.gitab6b1c0
 %global _origversion 1.11.2
 
 Name: docker-engine

diff --git a/hack/make/.build-rpm/docker-engine-selinux-euleros.spec b/hack/make/.build-rpm/docker-engine-selinux-euleros.spec
@@ -1,6 +1,6 @@
 # Some bits borrowed from the openstack-selinux package
-%global _version 1.11.2.11.ict
-%global _release 0.0.20170207.005653.git999f7a5
+%global _version 1.11.2.12.ict
+%global _release 0.0.20170213.005653.gitab6b1c0
 Name: docker-engine-selinux
 Version: %{_version}
 Release: %{_release}%{?dist}