From 553b39453324ad4a8d85101e520fe2cffd718352 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 Feb 2015 20:55:41 +0100
Subject: [PATCH 1/2] Fix issue #158

---
 .../com/github/dockerjava/api/model/Info.java | 57 +++++++++++++++++--
 .../core/command/InfoCmdImplTest.java         |  1 +
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index 7fe6ae798..fb63f2ff0 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -25,6 +25,9 @@ public class Info {
 
 	@JsonProperty("Debug")
 	private boolean debug;
+	
+	@JsonProperty("DockerRootDir")
+	private String DockerRootDir;
 
 	@JsonProperty("Driver")
 	private String driver;
@@ -34,9 +37,12 @@ public class Info {
 
 	@JsonProperty("ExecutionDriver")
 	private String executionDriver;
+	
+	@JsonProperty("ID")
+	private String ID;
 
 	@JsonProperty("IPv4Forwarding")
-	private String IPv4Forwarding;
+	private boolean IPv4Forwarding;
 
 	@JsonProperty("Images")
 	private int images;
@@ -52,9 +58,21 @@ public class Info {
 
 	@JsonProperty("KernelVersion")
 	private String kernelVersion;
+	
+	@JsonProperty("Labels")
+	private String Labels;
 
 	@JsonProperty("MemoryLimit")
 	private boolean memoryLimit;
+	
+	@JsonProperty("MemTotal")
+	private long memTotal;
+		
+	@JsonProperty("Name")
+	private String name;
+	
+	@JsonProperty("NCPU")
+	private int NCPU;
 
 	@JsonProperty("NEventsListener")
 	private long nEventListener;
@@ -64,12 +82,15 @@ public class Info {
 
 	@JsonProperty("NGoroutines")
 	private int NGoroutines;
+	
+	@JsonProperty("OperatingSystem")
+	private String OperatingSystem;
 
 	@JsonProperty("Sockets")
 	private String[] sockets;
 
 	@JsonProperty("SwapLimit")
-	private int swapLimit;
+	private boolean swapLimit;
 
 	public boolean isDebug() {
 		return debug;
@@ -78,6 +99,10 @@ public boolean isDebug() {
 	public int getContainers() {
 		return containers;
 	}
+	
+	public String getDockerRootDir() {
+		return DockerRootDir;
+	}
 
 	public String getDriver() {
 		return driver;
@@ -90,8 +115,12 @@ public List<Object> getDriverStatuses() {
 	public int getImages() {
 		return images;
 	}
+	
+	public String getID() {
+		return ID;
+	}
 
-	public String getIPv4Forwarding() {
+	public boolean getIPv4Forwarding() {
 		return IPv4Forwarding;
 	}
 
@@ -110,6 +139,10 @@ public String getInitSha1() {
 	public String getKernelVersion() {
 		return kernelVersion;
 	}
+	
+	public String getLabels() {
+		return Labels;
+	}
 
 	public String[] getSockets() {
 		return sockets;
@@ -122,6 +155,18 @@ public boolean isMemoryLimit() {
 	public long getnEventListener() {
 		return nEventListener;
 	}
+	
+	public long getMemTotal() {
+		return memTotal;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public int getNCPU() {
+		return NCPU;
+	}
 
 	public int getNFd() {
 		return NFd;
@@ -130,8 +175,12 @@ public int getNFd() {
 	public int getNGoroutines() {
 		return NGoroutines;
 	}
+	
+	public String getOperatingSystem() {
+		return OperatingSystem;
+	}
 
-	public int getSwapLimit() {
+	public boolean getSwapLimit() {
 		return swapLimit;
 	}
 
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
index d1de7076b..7170c12f3 100644
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -68,5 +68,6 @@ public void info() throws DockerException {
 		assertTrue(dockerInfo.getImages() > 0);
 		assertTrue(dockerInfo.getNFd() > 0);
 		assertTrue(dockerInfo.getNGoroutines() > 0);
+		assertTrue(dockerInfo.getNCPU() > 0);
 	}
 }

From 5bed982f2bb31d9e7971bd3123f343288f72653c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 Feb 2015 21:04:31 +0100
Subject: [PATCH 2/2] Fix race condition

---
 .../dockerjava/core/command/StartContainerCmdImplTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 22307b07b..37d805aa2 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -283,7 +283,7 @@ public void startContainerWithLinking() throws DockerException {
 		}
 
 		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("true")
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
 				.withName("container2").exec();
 
 		LOG.info("Created container2 {}", container2.toString());