Merge pull request #9623 from jfrazelle/merge_release_v1.4.0

Merge release v1.4.0
moby · Dec 12, 2014 · 5a26b89 · 5a26b89
2 parents ce1393c + fd831b4
commit 5a26b89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.4.0 (2014-12-11)
+
+#### Notable Features since 1.3.0
++ Set key=value labels to the daemon (displayed in `docker info`), applied with
+  new `-label` daemon flag
++ Add support for `ENV` in Dockerfile of the form: 
+  `ENV name=value name2=value2...`
++ New Overlayfs Storage Driver
++ `docker info` now returns an `ID` and `Name` field
++ Filter events by event name, container, or image
++ `docker cp` now supports copying from container volumes
+- Fixed `docker tag`, so it honors `--force` when overriding a tag for existing
+  image.
+
 ## 1.3.3 (2014-12-11)
 
 #### Security

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.3-dev
+1.4.0-dev