From 79a6b60597b451432defbd9217fa975bb0a6a2a4 Mon Sep 17 00:00:00 2001
From: Khva0 <roman@vasylyshyn.name>
Date: Mon, 10 Aug 2015 18:56:24 +0300
Subject: [PATCH 1/2] Add Memory, MemorySwap and CpuShares mappings to
 HostConfig

---
 .../dockerjava/api/model/HostConfig.java      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 5d4074eb9..9b31e05a9 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -66,6 +66,15 @@ public class HostConfig {
     @JsonProperty("Ulimits")
     private Ulimit[] ulimits;
 
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
+
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
+
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
+
     public HostConfig() {
     }
 
@@ -173,6 +182,18 @@ public Ulimit[] getUlimits() {
         return ulimits;
     }
 
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
+
+    public long getMemorySwap() {
+        return memorySwap;
+    }
+
+    public int getCpuShares() {
+        return cpuShares;
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);

From 9cfdf0ca3939a220ea61779371d7dc3532d00f10 Mon Sep 17 00:00:00 2001
From: Khva0 <roman@vasylyshyn.name>
Date: Mon, 10 Aug 2015 18:56:49 +0300
Subject: [PATCH 2/2] Remove Memory, MemorySwap and CpuShares mappings from
 ContainerConfig

---
 .../dockerjava/api/model/ContainerConfig.java | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 29b2af38e..34cb71d4d 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -28,12 +28,6 @@ public class ContainerConfig {
     @JsonProperty("Cmd")
     private String[] cmd;
 
-    @JsonProperty("CpuShares")
-    private int cpuShares = 0;
-
-    @JsonProperty("Cpuset")
-    private String cpuset = "";
-
     @JsonProperty("Domainname")
     private String domainName = "";
 
@@ -58,12 +52,6 @@ public class ContainerConfig {
     @JsonProperty("MacAddress")
     private String macAddress;
 
-    @JsonProperty("Memory")
-    private long memoryLimit = 0;
-
-    @JsonProperty("MemorySwap")
-    private long memorySwap = 0;
-
     @JsonProperty("NetworkDisabled")
     private boolean networkDisabled = false;
 
@@ -136,22 +124,6 @@ public String getMacAddress() {
         return macAddress;
     }
 
-    public long getMemoryLimit() {
-        return memoryLimit;
-    }
-
-    public long getMemorySwap() {
-        return memorySwap;
-    }
-
-    public int getCpuShares() {
-        return cpuShares;
-    }
-
-    public String getCpuset() {
-        return cpuset;
-    }
-
     public boolean isAttachStdin() {
         return attachStdin;
     }