From f28230d35c19befe5d6799667f37c1362dd1b782 Mon Sep 17 00:00:00 2001 From: Liron Levin Date: Tue, 8 Dec 2015 17:37:59 +0200 Subject: [PATCH] Rebase from master Signed-off-by: Liron Levin --- api/server/server.go | 6 +++--- integration-cli/docker_cli_help_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index e005baf240..218456e515 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -41,9 +41,9 @@ type Config struct { // Server contains instance details for the server type Server struct { - cfg *Config - servers []*HTTPServer - routers []router.Router + cfg *Config + servers []*HTTPServer + routers []router.Router authZPlugins []authorization.Plugin } diff --git a/integration-cli/docker_cli_help_test.go b/integration-cli/docker_cli_help_test.go index 0f4a091c58..cc026e7ef0 100644 --- a/integration-cli/docker_cli_help_test.go +++ b/integration-cli/docker_cli_help_test.go @@ -133,7 +133,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) { // Check each line for lots of stuff lines := strings.Split(out, "\n") for _, line := range lines { - c.Assert(len(line), checker.LessOrEqualThan, 91, check.Commentf("Help for %q is too long:\n%s", cmd, line)) + c.Assert(len(line), checker.LessOrEqualThan, 103, check.Commentf("Help for %q is too long:\n%s", cmd, line)) if scanForHome && strings.Contains(line, `"`+home) { c.Fatalf("Help for %q should use ~ instead of %q on:\n%s",