Merge branch 'graph' of ssh://github.com/dotcloud/docker into graph

2013-03-22 19:22:24 -07:00 · 2013-03-22 19:22:24 -07:00 · bc51d961cd
commit bc51d961cd
parent 12049f956a fc0eac37e4
3 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
 .vagrant
+bin
 docker/docker
 .*.swp
 a.out
--- a/auth/auth.go
+++ b/auth/auth.go
@ -16,8 +16,7 @@ import (
 const CONFIGFILE = ".dockercfg"

 // the registry server we want to login against
-//const REGISTRY_SERVER = "https://registry.docker.io"
-const REGISTRY_SERVER = "http://192.168.56.1:5000"
+const REGISTRY_SERVER = "https://registry.docker.io"

 type AuthConfig struct {
 	Username string `json:"username"`
--- a/deb/Makefile.deb
+++ b/deb/Makefile.deb