|
 |
0fbc0b4 |
From 73f4e7c09ed92b7b28e688376408745b46fadb2b Mon Sep 17 00:00:00 2001
|
|
|
0fbc0b4 |
From: Roland Grunberg <rgrunber@redhat.com>
|
|
|
0fbc0b4 |
Date: Fri, 10 Jul 2015 13:07:11 -0400
|
|
|
0fbc0b4 |
Subject: [PATCH] Support Remote API v1.19.
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
- Debug field in Info changed from an integer back to a boolean.
|
|
|
0fbc0b4 |
---
|
|
|
0fbc0b4 |
src/main/java/com/spotify/docker/client/messages/Info.java | 10 ++++------
|
|
|
0fbc0b4 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
diff --git src/main/java/com/spotify/docker/client/messages/Info.java src/main/java/com/spotify/docker/client/messages/Info.java
|
|
|
0fbc0b4 |
index f71b72c..b39afcd 100644
|
|
|
0fbc0b4 |
--- src/main/java/com/spotify/docker/client/messages/Info.java
|
|
|
0fbc0b4 |
+++ src/main/java/com/spotify/docker/client/messages/Info.java
|
|
|
0fbc0b4 |
@@ -17,8 +17,6 @@
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
package com.spotify.docker.client.messages;
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
-import com.google.common.base.Joiner;
|
|
|
0fbc0b4 |
-
|
|
|
0fbc0b4 |
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
import java.util.List;
|
|
|
0fbc0b4 |
@@ -36,7 +34,7 @@ public class Info {
|
|
|
0fbc0b4 |
@JsonProperty("Name") private String name;
|
|
|
0fbc0b4 |
@JsonProperty("ID") private String id;
|
|
|
0fbc0b4 |
@JsonProperty("OperatingSystem") private String operatingSystem;
|
|
|
0fbc0b4 |
- @JsonProperty("Debug") private int debug;
|
|
|
0fbc0b4 |
+ @JsonProperty("Debug") private Boolean debug;
|
|
|
0fbc0b4 |
@JsonProperty("NFd") private int fileDescriptors;
|
|
|
0fbc0b4 |
@JsonProperty("NGoroutines") private int goroutines;
|
|
|
0fbc0b4 |
@JsonProperty("NEventsListener") private int eventsListener;
|
|
|
0fbc0b4 |
@@ -94,7 +92,7 @@ public class Info {
|
|
|
0fbc0b4 |
}
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
public boolean debug() {
|
|
|
0fbc0b4 |
- return debug != 0;
|
|
|
0fbc0b4 |
+ return debug;
|
|
|
0fbc0b4 |
}
|
|
|
0fbc0b4 |
|
|
|
0fbc0b4 |
public int fileDescriptors() {
|
|
|
0fbc0b4 |
@@ -208,7 +206,7 @@ public class Info {
|
|
|
0fbc0b4 |
result = 31 * result + (name != null ? name.hashCode() : 0);
|
|
|
0fbc0b4 |
result = 31 * result + (executionDriver != null ? executionDriver.hashCode() : 0);
|
|
|
0fbc0b4 |
result = 31 * result + (kernelVersion != null ? kernelVersion.hashCode() : 0);
|
|
|
0fbc0b4 |
- result = 31 * result + debug;
|
|
|
0fbc0b4 |
+ result = 31 * result + (debug != null ? debug.hashCode() : 0);
|
|
|
0fbc0b4 |
result = 31 * result + fileDescriptors;
|
|
|
0fbc0b4 |
result = 31 * result + goroutines;
|
|
|
0fbc0b4 |
result = 31 * result + eventsListener;
|
|
|
0fbc0b4 |
@@ -224,7 +222,7 @@ public class Info {
|
|
|
0fbc0b4 |
public String toString() {
|
|
|
0fbc0b4 |
return String.format("Info{ containers = %d, images = %d, storageDriver = %s, "
|
|
|
0fbc0b4 |
+ "driverStatus = %s, cpus = %d, memTotal = %d, name = %s, "
|
|
|
0fbc0b4 |
- + "executionDriver = %s, kernelVersion = %s, debug = %d, "
|
|
|
0fbc0b4 |
+ + "executionDriver = %s, kernelVersion = %s, debug = %b, "
|
|
|
0fbc0b4 |
+ "fileDescriptors = %d, goroutines = %d, eventsListener = %d, "
|
|
|
0fbc0b4 |
+ "initPath = %s, initSha1 = %s, indexServerAddress = %s, "
|
|
|
0fbc0b4 |
+ "memoryLimit = %b, swapLimit = %b",
|
|
|
0fbc0b4 |
--
|
|
|
0fbc0b4 |
2.1.0
|
|
|
0fbc0b4 |
|