From 126eade4b9eddbcca762429228db1cfbd77ece2b Mon Sep 17 00:00:00 2001
From: Victor Vieux <victorvieux@gmail.com>
Date: Tue, 30 Jun 2015 15:20:44 -0700
Subject: [PATCH] remove 2 warnings in docker info

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
---
 Godeps/Godeps.json                            |  2 +-
 .../github.com/samalba/dockerclient/types.go  |  2 ++
 api/handlers.go                               | 22 ++++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d91f556ff2..ecd683ebd7 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -105,7 +105,7 @@
 		},
 		{
 			"ImportPath": "github.com/samalba/dockerclient",
-			"Rev": "12570e600d71374233e5056ba315f657ced496c7"
+			"Rev": "661e5e686f3c69aa71ec447efd7a0d32f8dc0813"
 		},
 		{
 			"ImportPath": "github.com/samuel/go-zookeeper/zk",
diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go
index 2b2ca44220..aef999d824 100644
--- a/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go
+++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go
@@ -305,6 +305,8 @@ type Info struct {
 	MemoryLimit        interface{}
 	SwapLimit          interface{}
 	IPv4Forwarding     interface{}
+	BridgeNfIptables   bool
+	BridgeNfIp6tables  bool
 	DockerRootDir      string
 	HttpProxy          string
 	HttpsProxy         string
diff --git a/api/handlers.go b/api/handlers.go
index f0258c71d8..15b7884a3f 100644
--- a/api/handlers.go
+++ b/api/handlers.go
@@ -25,16 +25,18 @@ const APIVERSION = "1.16"
 // GET /info
 func getInfo(c *context, w http.ResponseWriter, r *http.Request) {
 	info := dockerclient.Info{
-		Containers:      int64(len(c.cluster.Containers())),
-		Images:          int64(len(c.cluster.Images())),
-		DriverStatus:    c.statusHandler.Status(),
-		NEventsListener: int64(c.eventsHandler.Size()),
-		Debug:           c.debug,
-		MemoryLimit:     true,
-		SwapLimit:       true,
-		IPv4Forwarding:  true,
-		NCPU:            c.cluster.TotalCpus(),
-		MemTotal:        c.cluster.TotalMemory(),
+		Containers:        int64(len(c.cluster.Containers())),
+		Images:            int64(len(c.cluster.Images())),
+		DriverStatus:      c.statusHandler.Status(),
+		NEventsListener:   int64(c.eventsHandler.Size()),
+		Debug:             c.debug,
+		MemoryLimit:       true,
+		SwapLimit:         true,
+		IPv4Forwarding:    true,
+		BridgeNfIptables:  true,
+		BridgeNfIp6tables: true,
+		NCPU:              c.cluster.TotalCpus(),
+		MemTotal:          c.cluster.TotalMemory(),
 	}
 
 	w.Header().Set("Content-Type", "application/json")