kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Rebase from master

Browse source 
Signed-off-by: Liron Levin <liron@twistlock.com>
This commit is contained in:
Liron Levin 2015-12-08 17:37:59 +02:00
parent 8cc0892269
commit f28230d35c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/server/server.go
View file

@ -41,9 +41,9 @@ type Config struct {
// Server contains instance details for the server // Server contains instance details for the server
type Server struct { type Server struct {
cfg *Config cfg *Config
servers []*HTTPServer servers []*HTTPServer
routers []router.Router routers []router.Router
authZPlugins []authorization.Plugin authZPlugins []authorization.Plugin
} }

2
integration-cli/docker_cli_help_test.go
View file

@ -133,7 +133,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
// Check each line for lots of stuff // Check each line for lots of stuff
lines := strings.Split(out, "\n") lines := strings.Split(out, "\n")
for _, line := range lines { 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) { if scanForHome && strings.Contains(line, `"`+home) {
c.Fatalf("Help for %q should use ~ instead of %q on:\n%s", c.Fatalf("Help for %q should use ~ instead of %q on:\n%s",