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

Marcus Linke · Marcus Linke · commit c256ccf2d4c2 · 2015-01-21T21:21:08.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 docker-java-0.10.5-SNAPSHOT
 ---
+ * [#125](https://github.com/docker-java/docker-java/pull/125) Unixsocket support
  * [#123](https://github.com/docker-java/docker-java/pull/123) support DOCKER_TLS_VERIFY to detect ssl
  * [#121](https://github.com/docker-java/docker-java/pull/121) Implemented support for commands: Exec-start, Exec-create 
  * [#120](https://github.com/docker-java/docker-java/pull/120) Command resource cleanup after command execution
