Update to latest go-dockerclient. Fix .gitignore expression to allow

docker/pkg packages.
lattwood · May 28, 2016 · d4dca3b · d4dca3b
1 parent 7ebefef
commit d4dca3b
Show file tree

Hide file tree

Showing 124 changed files with 2,462 additions and 2,088 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,7 @@ _testmain.go
 *.prof
 
 bin/
-pkg/
+/pkg/
 .vagrant/
 website/build/
 website/npm-debug.log

diff --git a/...al/github.com/docker/docker/opts/hosts.go → ...or/github.com/docker/docker/opts/hosts.go b/...al/github.com/docker/docker/opts/hosts.go → ...or/github.com/docker/docker/opts/hosts.go
diff --git a/...thub.com/docker/docker/opts/hosts_unix.go → ...thub.com/docker/docker/opts/hosts_unix.go b/...thub.com/docker/docker/opts/hosts_unix.go → ...thub.com/docker/docker/opts/hosts_unix.go
diff --git a/...b.com/docker/docker/opts/hosts_windows.go → ...b.com/docker/docker/opts/hosts_windows.go b/...b.com/docker/docker/opts/hosts_windows.go → ...b.com/docker/docker/opts/hosts_windows.go
diff --git a/...ernal/github.com/docker/docker/opts/ip.go → vendor/github.com/docker/docker/opts/ip.go b/...ernal/github.com/docker/docker/opts/ip.go → vendor/github.com/docker/docker/opts/ip.go
diff --git a/...nal/github.com/docker/docker/opts/opts.go → vendor/github.com/docker/docker/opts/opts.go b/...nal/github.com/docker/docker/opts/opts.go → vendor/github.com/docker/docker/opts/opts.go
diff --git a/...ithub.com/docker/docker/opts/opts_unix.go → ...ithub.com/docker/docker/opts/opts_unix.go b/...ithub.com/docker/docker/opts/opts_unix.go → ...ithub.com/docker/docker/opts/opts_unix.go
diff --git a/...ub.com/docker/docker/opts/opts_windows.go → ...ub.com/docker/docker/opts/opts_windows.go b/...ub.com/docker/docker/opts/opts_windows.go → ...ub.com/docker/docker/opts/opts_windows.go
diff --git a/...b.com/docker/docker/pkg/archive/README.md → ...b.com/docker/docker/pkg/archive/README.md b/...b.com/docker/docker/pkg/archive/README.md → ...b.com/docker/docker/pkg/archive/README.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ _testmain.go @@
     *.prof
     bin/
-    pkg/
+    /pkg/
     .vagrant/
     website/build/
     website/npm-debug.log
@@ Expand Down @@