Merge pull request kpelykh#1 from djsly/master

alexec · alexec · commit 66033efbe178 · 2014-04-17T00:39:28.000+01:00
Problem compiling due + Problem with docker-maven-plugin
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -548,7 +548,7 @@ public ClientResponse copyFile(String containerId, String resource) throws Docke
         }
     }
 
-    public List<ChangeLog> containterDiff(String containerId) throws DockerException, NotFoundException {
+    public List<ChangeLog> containerDiff(String containerId) throws DockerException, NotFoundException {
 
         WebResource webResource = client.resource(restEndpointUrl + String.format("/containers/%s/changes", containerId));
 
diff --git a/src/main/java/com/kpelykh/docker/client/model/Version.java b/src/main/java/com/kpelykh/docker/client/model/Version.java
@@ -28,7 +28,7 @@ public class Version {
     @JsonProperty("Os")
     private String operatingSystem;
 
-    @JsonProperty
+    @JsonProperty("ApiVersion")
     private String apiVersion;
 
     public String getVersion() {

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ public ClientResponse copyFile(String containerId, String resource) throws Docke`
`548`	`548`	`}`
`549`	`549`	`}`
`550`	`550`
`551`		`- public List<ChangeLog> containterDiff(String containerId) throws DockerException, NotFoundException {`
	`551`	`+ public List<ChangeLog> containerDiff(String containerId) throws DockerException, NotFoundException {`
`552`	`552`
`553`	`553`	`WebResource webResource = client.resource(restEndpointUrl + String.format("/containers/%s/changes", containerId));`
`554`	`554`