summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Frazelle <jess@docker.com>2015-03-23 15:29:13 -0700
committerJessica Frazelle <jess@docker.com>2015-03-23 15:29:13 -0700
commit746e83023052e32b2cba8fccf67b6232e5c86886 (patch)
treeaff4548767f6d67073dbbc3462889a458a1d4128
parent4f744ca7812119ea36fcd3d2b8f9477a2fe8cfbf (diff)
downloaddocker-746e83023052e32b2cba8fccf67b6232e5c86886.tar.gz
Bump version to v1.6.0v1.6.0-rc1
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
-rw-r--r--CHANGELOG.md17
-rw-r--r--VERSION2
2 files changed, 18 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e845e459a..5a1bdb008e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+## 1.6.0 (2015-04-07)
+
+#### Builder
++ Building images from an image ID
++ `commit --change` to apply specified Dockerfile instructions while committing the image
++ `import --change` to apply specified Dockerfile instructions while importing the image
+
+#### Client
++ Windows Support
+
+#### Runtime
++ Container and image Labels
++ `--cgroup-parent` for specifying a parent cgroup to place container cgroup within
++ Logging drivers, `json-file` or `syslog`
++ Pulling images by ID
++ `--ulimit` to set the ulimit on a container
+
## 1.5.0 (2015-02-10)
#### Builder
diff --git a/VERSION b/VERSION
index 59b9db0c75..fce5e0530c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.0-dev
+1.6.0-rc1