Merge pull request #29338 from vieux/bump_1.12.4_version
bump version to 1.12.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62ee5b9..a4f8d84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
https://docs.docker.com/engine/deprecated/ where target removal dates can also
be found.
-## 1.12.4 (2016-12-06)
+## 1.12.4 (2016-12-12)
**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
@@ -46,6 +46,7 @@
- Fix volume store locking [#29151](https://github.com/docker/docker/pull/29151)
- Ensure consistent status code in API [#29150](https://github.com/docker/docker/pull/29150)
- Fix incorrect opaque directory permission in overlay2 [#29093](https://github.com/docker/docker/pull/29093)
+- Detect plugin content and error out on `docker pull` [#29297](https://github.com/docker/docker/pull/29297)
### Swarm Mode
diff --git a/VERSION b/VERSION
index ce1d504..89c881b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.12.4-rc1
+1.12.4
