summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Vieux <victorvieux@gmail.com>2017-04-26 15:08:31 -0700
committerVictor Vieux <victorvieux@gmail.com>2017-04-26 15:08:31 -0700
commitc57fdb2a14cfba584686ddad909e3006284d10aa (patch)
treed00e1573d438308d43d229aa55c98972055d54a8
parenteaffbcb25d844ba4088be76023b2f730c9984217 (diff)
downloaddocker-c57fdb2a14cfba584686ddad909e3006284d10aa.tar.gz
bump to rc2v17.05.0-ce-rc2
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
-rw-r--r--CHANGELOG.md1
-rw-r--r--VERSION2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa5052038d..4fd1cf73ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ be found.
* Improve `docker version --format` option when the client has downgraded the API version [#31022](https://github.com/docker/docker/pull/31022)
* Prompt when using an encrypted client certificate to connect to a docker daemon [#31364](https://github.com/docker/docker/pull/31364)
* Display created tags on successful `docker build` [#32077](https://github.com/docker/docker/pull/32077)
+* Cleanup compose convert error messages [#32087](https://github.com/moby/moby/pull/32087)
### Contrib
diff --git a/VERSION b/VERSION
index c3337a23f9..0c15909499 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.05.0-ce-rc1
+17.05.0-ce-rc2