daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7225 from vieux/update_path 

update go import path and libcontainer
master
Victor Vieux 2014-07-24 17:22:21 -07:00
parent 2ff0ef4407 822f8c1b52
commit 660a0f5cd3
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/MAINTAINERS
View File

@ -1,5 +1,5 @@
Sam Alba <sam@dotcloud.com> (@samalba) Sam Alba <sam@docker.com> (@samalba)
Joffrey Fuhrer <joffrey@dotcloud.com> (@shin-) Joffrey Fuhrer <joffrey@docker.com> (@shin-)
Ken Cochrane <ken@dotcloud.com> (@kencochrane) Ken Cochrane <ken@docker.com> (@kencochrane)
Vincent Batts <vbatts@redhat.com> (@vbatts) Vincent Batts <vbatts@redhat.com> (@vbatts)
Olivier Gambier <olivier@docker.com> (@dmp42) Olivier Gambier <olivier@docker.com> (@dmp42)

4
docs/auth.go
View File

@ -11,7 +11,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
// Where we store the config file // Where we store the config file
@ -20,7 +20,7 @@ const CONFIGFILE = ".dockercfg"
// Only used for user auth + account creation // Only used for user auth + account creation
const INDEXSERVER = "https://index.docker.io/v1/" const INDEXSERVER = "https://index.docker.io/v1/"
//const INDEXSERVER = "https://indexstaging-docker.dotcloud.com/v1/" //const INDEXSERVER = "https://registry-stage.hub.docker.com/v1/"
var ( var (
ErrConfigFileMissing = errors.New("The Auth config file is missing") ErrConfigFileMissing = errors.New("The Auth config file is missing")

4
docs/registry.go
View File

@ -23,8 +23,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
var ( var (

2
docs/registry_mock_test.go
View File

@ -3,7 +3,7 @@ package registry
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"io" "io"
"io/ioutil" "io/ioutil"

4
docs/registry_test.go
View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
var ( var (
@ -145,7 +145,7 @@ func TestPushImageLayerRegistry(t *testing.T) {
} }
func TestResolveRepositoryName(t *testing.T) { func TestResolveRepositoryName(t *testing.T) {
_, _, err := ResolveRepositoryName("https://github.com/dotcloud/docker") _, _, err := ResolveRepositoryName("https://github.com/docker/docker")
assertEqual(t, err, ErrInvalidRepositoryName, "Expected error invalid repo name") assertEqual(t, err, ErrInvalidRepositoryName, "Expected error invalid repo name")
ep, repo, err := ResolveRepositoryName("fooo/bar") ep, repo, err := ResolveRepositoryName("fooo/bar")
if err != nil { if err != nil {

2
docs/service.go
View File

@ -1,7 +1,7 @@
package registry package registry
import ( import (
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
) )
// Service exposes registry capabilities in the standard Engine // Service exposes registry capabilities in the standard Engine