Merge branch 'master' of https://github.com/docker-java/docker-java

Marcus Linke · Marcus Linke · commit 8c948b1140da · 2015-04-27T21:42:24.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+
+v1.2.0
+---
 * [#194](https://github.com/docker-java/docker-java/pull/194) Fixed remove intermediate containers bug on build goal
 * [#193](https://github.com/docker-java/docker-java/pull/193) Add HostConfig related methods from start command to create command
 * [#192](https://github.com/docker-java/docker-java/pull/192) Added a Links constructor accepting a List object
