Merge remote-tracking branch 'origin/master' into for-upstream-v0.10.0

mfulgo · mfulgo · commit 70aba655ceed · 2014-08-01T19:08:09.000-04:00
Conflicts:
	src/main/java/com/github/dockerjava/client/command/CreateContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/client/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/client/command/CreateContainerCmd.java
@@ -69,6 +69,11 @@ public CreateContainerCmd withVolumesFrom(String... volumesFrom) {
 		return this;
 	}
 
+  public CreateContainerCmd withTTY(boolean tty) {
+    this.containerCreateConfig.withTty(tty);
+    return this;
+  }
+	
     public CreateContainerCmd withEnv(String... env) {
             Preconditions.checkNotNull(env, "env was not specified");
             this.containerCreateConfig.withEnv(env);
