From 4595d4fb03093acf87b905bebc5ba4964d7c0707 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Thu, 11 Dec 2014 15:00:44 -0800
Subject: [PATCH] Bump version to v1.4.0

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
---
 CHANGELOG.md | 14 ++++++++++++++
 VERSION      |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 346fe4ce2f..6db1a2a372 100644
--- 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
index 456ea726a0..88c5fb891d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.3-dev
+1.4.0