Merge remote-tracking branch 'origin/master'

zettaset-kpelykh · zettaset-kpelykh · commit 40934589f318 · 2014-02-04T10:42:28.000-08:00
diff --git a/src/main/java/com/kpelykh/docker/client/model/Info.java b/src/main/java/com/kpelykh/docker/client/model/Info.java
@@ -50,6 +50,9 @@ public class Info {
 
     @JsonProperty("NGoroutines")
     private int    NGoroutines;
+    
+    @JsonProperty("SwapLimit")
+    private int swapLimit;
 
     public boolean isDebug() {
         return debug;
@@ -102,6 +105,10 @@ public int getNFd() {
     public int getNGoroutines() {
         return NGoroutines;
     }
+    
+    public int getSwapLimit() {
+    	return swapLimit;
+    }
 
     @Override
     public String toString() {
@@ -112,6 +119,7 @@ public String toString() {
                 ", NFd=" + NFd +
                 ", NGoroutines=" + NGoroutines +
                 ", memoryLimit=" + memoryLimit +
+                ", swapLimit=" + swapLimit +
                 ", lxcVersion='" + lxcVersion + '\'' +
                 ", nEventListener=" + nEventListener +
                 ", kernelVersion='" + kernelVersion + '\'' +
diff --git a/src/main/java/com/kpelykh/docker/client/model/Version.java b/src/main/java/com/kpelykh/docker/client/model/Version.java
@@ -18,6 +18,9 @@ public class Version {
 
     @JsonProperty("GoVersion")
     private String  goVersion;
+    
+    @JsonProperty("KernelVersion")
+    private String kernelVersion;
 
     public String getVersion() {
         return version;
@@ -31,12 +34,17 @@ public String getGoVersion() {
         return goVersion;
     }
 
+    public String getKernelVersion() {
+    	return kernelVersion;
+    }
+    
     @Override
     public String toString() {
         return "Version{" +
                 "version='" + version + '\'' +
                 ", gitCommit='" + gitCommit + '\'' +
                 ", goVersion='" + goVersion + '\'' +
+                ", kernelVersion='" + kernelVersion + '\'' +
                 '}';
     }
 
