From 99d0413033e6ecf05a30eac18d51349ef859a9c7 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Thu, 16 Apr 2015 11:38:05 -0700 Subject: [PATCH 1/2] Bump version to v1.6.0 Docker-DCO-1.1-Signed-off-by: Jessie Frazelle (github: jfrazelle) (cherry picked from commit 47496519da9664202d900d3635bb840509fa9647) --- CHANGELOG.md | 20 ++++++++++++++++++++ VERSION | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e845e459a..9c541388e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## 1.6.0 (2015-04-07) + +#### Builder ++ Building images from an image ID ++ build containers with resource constraints, ie `docker build --cpu-shares=100 --memory=1024m...` ++ `commit --change` to apply specified Dockerfile instructions while committing the image ++ `import --change` to apply specified Dockerfile instructions while importing the image ++ basic build cancellation + +#### Client ++ Windows Support + +#### Runtime ++ Container and image Labels ++ `--cgroup-parent` for specifying a parent cgroup to place container cgroup within ++ Logging drivers, `json-file`, `syslog`, or `none` ++ Pulling images by ID ++ `--ulimit` to set the ulimit on a container ++ `--default-ulimit` option on the daemon which applies to all created containers (and overwritten by `--ulimit` on run) + ## 1.5.0 (2015-02-10) #### Builder diff --git a/VERSION b/VERSION index 59b9db0c75..dc1e644a10 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.0-dev +1.6.0 From e79c77fb8d16ba38387e43fbf9224e341f252b95 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Thu, 16 Apr 2015 12:45:30 -0700 Subject: [PATCH 2/2] bump version to 1.6.0-dev Signed-off-by: Jessica Frazelle --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index dc1e644a10..de023c91b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.0 +1.7.0-dev