[docker-io] bump to 0.6.3, docker push solved
Lokesh Mandvekar
lsm5 at fedoraproject.org
Fri Sep 27 00:13:34 UTC 2013
commit a7be26d880f5dd271fd3a6309807a67b4e7c274c
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date: Thu Sep 26 19:13:13 2013 -0500
bump to 0.6.3, docker push solved
Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>
.gitignore | 1 +
docker-0.6.2-remove-dotcloud-tar.patch | 12 -
...per.patch => docker-0.6.3-alexl-devmapper.patch | 3970 ++++++++++++++------
docker-0.6.3-remove-dotcloud-tar.patch | 12 +
docker-io.spec | 8 +-
sources | 2 +-
6 files changed, 2894 insertions(+), 1111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2ee710..e8ea108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/v0.6.2.tar.gz
+/v0.6.3.tar.gz
diff --git a/docker-0.6.2-alexl-devmapper.patch b/docker-0.6.3-alexl-devmapper.patch
similarity index 93%
rename from docker-0.6.2-alexl-devmapper.patch
rename to docker-0.6.3-alexl-devmapper.patch
index f57aa3b..d8a8b60 100644
--- a/docker-0.6.2-alexl-devmapper.patch
+++ b/docker-0.6.3-alexl-devmapper.patch
@@ -1,6 +1,6 @@
-diff -uNr docker-0.6.2/api.go docker-devmapper/api.go
---- docker-0.6.2/api.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/api.go 2013-09-23 10:37:39.287305262 -0500
+diff -uNr docker-0.6.3/api.go docker/api.go
+--- docker-0.6.3/api.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/api.go 2013-09-26 14:37:16.135935757 -0500
@@ -72,18 +72,9 @@
http.Error(w, err.Error(), statusCode)
}
@@ -322,9 +322,9 @@ diff -uNr docker-0.6.2/api.go docker-devmapper/api.go
id, err := b.Build(context)
if err != nil {
fmt.Fprintf(w, "Error build: %s\n", err)
-diff -uNr docker-0.6.2/api_test.go docker-devmapper/api_test.go
---- docker-0.6.2/api_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/api_test.go 2013-09-23 10:37:38.713306858 -0500
+diff -uNr docker-0.6.3/api_test.go docker/api_test.go
+--- docker-0.6.3/api_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/api_test.go 2013-09-26 14:37:16.137935748 -0500
@@ -445,7 +445,7 @@
}
@@ -357,9 +357,9 @@ diff -uNr docker-0.6.2/api_test.go docker-devmapper/api_test.go
}
func TestPostContainersKill(t *testing.T) {
-diff -uNr docker-0.6.2/archive.go docker-devmapper/archive.go
---- docker-0.6.2/archive.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/archive.go 2013-09-23 10:37:39.546304541 -0500
+diff -uNr docker-0.6.3/archive.go docker/archive.go
+--- docker-0.6.3/archive.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/archive.go 2013-09-26 14:37:16.137935748 -0500
@@ -80,20 +80,73 @@
// Tar creates an archive from the directory at `path`, and returns it as a
// stream of bytes.
@@ -478,9 +478,9 @@ diff -uNr docker-0.6.2/archive.go docker-devmapper/archive.go
}()
// Run the command and return the pipe
if err := cmd.Start(); err != nil {
-diff -uNr docker-0.6.2/archive_test.go docker-devmapper/archive_test.go
---- docker-0.6.2/archive_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/archive_test.go 2013-09-23 10:37:39.133305690 -0500
+diff -uNr docker-0.6.3/archive_test.go docker/archive_test.go
+--- docker-0.6.3/archive_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/archive_test.go 2013-09-26 14:37:16.137935748 -0500
@@ -14,7 +14,7 @@
func TestCmdStreamLargeStderr(t *testing.T) {
@@ -508,9 +508,9 @@ diff -uNr docker-0.6.2/archive_test.go docker-devmapper/archive_test.go
if err != nil {
t.Fatal(err)
}
-diff -uNr docker-0.6.2/buildfile.go docker-devmapper/buildfile.go
---- docker-0.6.2/buildfile.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/buildfile.go 2013-09-23 10:37:39.238305398 -0500
+diff -uNr docker-0.6.3/buildfile.go docker/buildfile.go
+--- docker-0.6.3/buildfile.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/buildfile.go 2013-09-26 14:37:16.138935744 -0500
@@ -1,6 +1,7 @@
package docker
@@ -611,9 +611,9 @@ diff -uNr docker-0.6.2/buildfile.go docker-devmapper/buildfile.go
- rm: rm,
}
}
-diff -uNr docker-0.6.2/buildfile_test.go docker-devmapper/buildfile_test.go
---- docker-0.6.2/buildfile_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/buildfile_test.go 2013-09-23 10:37:39.263305328 -0500
+diff -uNr docker-0.6.3/buildfile_test.go docker/buildfile_test.go
+--- docker-0.6.3/buildfile_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/buildfile_test.go 2013-09-26 14:37:16.138935744 -0500
@@ -45,34 +45,6 @@
nil,
},
@@ -676,12 +676,25 @@ diff -uNr docker-0.6.2/buildfile_test.go docker-devmapper/buildfile_test.go
_, err = buildfile.Build(mkTestContext(dockerfile, context.files, t))
if err == nil {
-diff -uNr docker-0.6.2/CHANGELOG.md docker-devmapper/CHANGELOG.md
---- docker-0.6.2/CHANGELOG.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/CHANGELOG.md 2013-09-23 10:37:39.276305292 -0500
-@@ -1,24 +1,5 @@
+diff -uNr docker-0.6.3/CHANGELOG.md docker/CHANGELOG.md
+--- docker-0.6.3/CHANGELOG.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/CHANGELOG.md 2013-09-26 14:37:02.920991363 -0500
+@@ -1,37 +1,5 @@
# Changelog
+-## 0.6.3 (2013-09-23)
+-* Packaging: Update tar vendor dependency
+-- Client: Fix detach issue
+-- Runtime: Only copy and change permissions on non-bindmount volumes
+-- Registry: Update regular expression to match index
+-* Runtime: Allow multiple volumes-from
+-* Packaging: Download apt key over HTTPS
+-* Documentation: Update section on extracting the docker binary after build
+-* Documentation: Update development environment docs for new build process
+-* Documentation: Remove 'base' image from documentation
+-* Packaging: Add 'docker' group on install for ubuntu package
+-- Runtime: Fix HTTP imports from STDIN
+-
-## 0.6.2 (2013-09-17)
-+ Hack: Vendor all dependencies
-+ Builder: Add -rm option in order to remove intermediate containers
@@ -704,9 +717,9 @@ diff -uNr docker-0.6.2/CHANGELOG.md docker-devmapper/CHANGELOG.md
## 0.6.1 (2013-08-23)
* Registry: Pass "meta" headers in API calls to the registry
- Packaging: Use correct upstart script with new build tool
-diff -uNr docker-0.6.2/changes.go docker-devmapper/changes.go
---- docker-0.6.2/changes.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/changes.go 2013-09-23 10:37:39.487304706 -0500
+diff -uNr docker-0.6.3/changes.go docker/changes.go
+--- docker-0.6.3/changes.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/changes.go 2013-09-26 14:37:16.138935744 -0500
@@ -5,6 +5,7 @@
"os"
"path/filepath"
@@ -1014,10 +1027,29 @@ diff -uNr docker-0.6.2/changes.go docker-devmapper/changes.go
+
+ return newRoot.Changes(oldRoot), nil
+}
-diff -uNr docker-0.6.2/commands.go docker-devmapper/commands.go
---- docker-0.6.2/commands.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/commands.go 2013-09-23 10:37:39.246305376 -0500
-@@ -165,7 +165,6 @@
+diff -uNr docker-0.6.3/commands.go docker/commands.go
+--- docker-0.6.3/commands.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/commands.go 2013-09-26 14:37:16.139935740 -0500
+@@ -6,7 +6,6 @@
+ "bytes"
+ "encoding/base64"
+ "encoding/json"
+- "errors"
+ "flag"
+ "fmt"
+ "github.com/dotcloud/docker/auth"
+@@ -37,10 +36,6 @@
+ VERSION string
+ )
+
+-var (
+- ErrConnectionRefused = errors.New("Can't connect to docker daemon. Is 'docker -d' running on this host?")
+-)
+-
+ func (cli *DockerCli) getMethod(name string) (reflect.Method, bool) {
+ methodName := "Cmd" + strings.ToUpper(name[:1]) + strings.ToLower(name[1:])
+ return reflect.TypeOf(cli).MethodByName(methodName)
+@@ -170,7 +165,6 @@
tag := cmd.String("t", "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")
suppressOutput := cmd.Bool("q", false, "Suppress verbose build output")
noCache := cmd.Bool("no-cache", false, "Do not use cache when building the image")
@@ -1025,7 +1057,7 @@ diff -uNr docker-0.6.2/commands.go docker-devmapper/commands.go
if err := cmd.Parse(args); err != nil {
return nil
}
-@@ -216,9 +215,6 @@
+@@ -221,9 +215,6 @@
if *noCache {
v.Set("nocache", "1")
}
@@ -1035,10 +1067,240 @@ diff -uNr docker-0.6.2/commands.go docker-devmapper/commands.go
req, err := http.NewRequest("POST", fmt.Sprintf("/v%g/build?%s", APIVERSION, v.Encode()), body)
if err != nil {
return err
-diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
---- docker-0.6.2/container.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/container.go 2013-09-23 10:37:38.715306852 -0500
-@@ -290,12 +290,17 @@
+@@ -800,13 +791,11 @@
+ v.Set("tag", tag)
+ v.Set("fromSrc", src)
+
+- var in io.Reader
+-
+- if src == "-" {
+- in = cli.in
++ err := cli.stream("POST", "/images/create?"+v.Encode(), cli.in, cli.out, nil)
++ if err != nil {
++ return err
+ }
+-
+- return cli.stream("POST", "/images/create?"+v.Encode(), in, cli.out, nil)
++ return nil
+ }
+
+ func (cli *DockerCli) CmdPush(args ...string) error {
+@@ -1263,7 +1252,7 @@
+
+ if container.Config.Tty {
+ if err := cli.monitorTtySize(cmd.Arg(0)); err != nil {
+- utils.Debugf("Error monitoring tty size: %s", err)
++ return err
+ }
+ }
+
+@@ -1572,12 +1561,12 @@
+ // Detached mode
+ <-wait
+ } else {
+- status, err := getExitCode(cli, runResult.ID)
++ status, err := waitForExit(cli, runResult.ID)
+ if err != nil {
+ return err
+ }
+ if status != 0 {
+- return &utils.StatusError{Status: status}
++ return &utils.StatusError{status}
+ }
+ }
+
+@@ -1643,7 +1632,7 @@
+ dial, err := net.Dial(cli.proto, cli.addr)
+ if err != nil {
+ if strings.Contains(err.Error(), "connection refused") {
+- return nil, -1, ErrConnectionRefused
++ return nil, -1, fmt.Errorf("Can't connect to docker daemon. Is 'docker -d' running on this host?")
+ }
+ return nil, -1, err
+ }
+@@ -1652,7 +1641,7 @@
+ defer clientconn.Close()
+ if err != nil {
+ if strings.Contains(err.Error(), "connection refused") {
+- return nil, -1, ErrConnectionRefused
++ return nil, -1, fmt.Errorf("Can't connect to docker daemon. Is 'docker -d' running on this host?")
+ }
+ return nil, -1, err
+ }
+@@ -1871,11 +1860,7 @@
+ func waitForExit(cli *DockerCli, containerId string) (int, error) {
+ body, _, err := cli.call("POST", "/containers/"+containerId+"/wait", nil)
+ if err != nil {
+- // If we can't connect, then the daemon probably died.
+- if err != ErrConnectionRefused {
+- return -1, err
+- }
+- return -1, nil
++ return -1, err
+ }
+
+ var out APIWait
+@@ -1885,22 +1870,6 @@
+ return out.StatusCode, nil
+ }
+
+-func getExitCode(cli *DockerCli, containerId string) (int, error) {
+- body, _, err := cli.call("GET", "/containers/"+containerId+"/json", nil)
+- if err != nil {
+- // If we can't connect, then the daemon probably died.
+- if err != ErrConnectionRefused {
+- return -1, err
+- }
+- return -1, nil
+- }
+- c := &Container{}
+- if err := json.Unmarshal(body, c); err != nil {
+- return -1, err
+- }
+- return c.State.ExitCode, nil
+-}
+-
+ func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string) *DockerCli {
+ var (
+ isTerminal = false
+diff -uNr docker-0.6.3/commands_test.go docker/commands_test.go
+--- docker-0.6.3/commands_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/commands_test.go 2013-09-26 14:37:16.140935736 -0500
+@@ -369,110 +369,6 @@
+ }
+ }
+
+-// TestRunDetach checks attaching and detaching with the escape sequence.
+-func TestRunDetach(t *testing.T) {
+-
+- stdin, stdinPipe := io.Pipe()
+- stdout, stdoutPipe := io.Pipe()
+-
+- cli := NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
+- defer cleanup(globalRuntime)
+-
+- ch := make(chan struct{})
+- go func() {
+- defer close(ch)
+- cli.CmdRun("-i", "-t", unitTestImageID, "cat")
+- }()
+-
+- setTimeout(t, "First read/write assertion timed out", 2*time.Second, func() {
+- if err := assertPipe("hello\n", "hello", stdout, stdinPipe, 15); err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- container := globalRuntime.List()[0]
+-
+- setTimeout(t, "Escape sequence timeout", 5*time.Second, func() {
+- stdinPipe.Write([]byte{'', ''})
+- if err := stdinPipe.Close(); err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- // wait for CmdRun to return
+- setTimeout(t, "Waiting for CmdRun timed out", 5*time.Second, func() {
+- <-ch
+- })
+-
+- time.Sleep(500 * time.Millisecond)
+- if !container.State.Running {
+- t.Fatal("The detached container should be still running")
+- }
+-
+- setTimeout(t, "Waiting for container to die timed out", 20*time.Second, func() {
+- container.Kill()
+- container.Wait()
+- })
+-}
+-
+-// TestAttachDetach checks that attach in tty mode can be detached
+-func TestAttachDetach(t *testing.T) {
+- stdin, stdinPipe := io.Pipe()
+- stdout, stdoutPipe := io.Pipe()
+-
+- cli := NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
+- defer cleanup(globalRuntime)
+-
+- go stdout.Read(make([]byte, 1024))
+- setTimeout(t, "Starting container timed out", 2*time.Second, func() {
+- if err := cli.CmdRun("-i", "-t", "-d", unitTestImageID, "cat"); err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- container := globalRuntime.List()[0]
+-
+- stdin, stdinPipe = io.Pipe()
+- stdout, stdoutPipe = io.Pipe()
+- cli = NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
+-
+- ch := make(chan struct{})
+- go func() {
+- defer close(ch)
+- if err := cli.CmdAttach(container.ShortID()); err != nil {
+- t.Fatal(err)
+- }
+- }()
+-
+- setTimeout(t, "First read/write assertion timed out", 2*time.Second, func() {
+- if err := assertPipe("hello\n", "hello", stdout, stdinPipe, 15); err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- setTimeout(t, "Escape sequence timeout", 5*time.Second, func() {
+- stdinPipe.Write([]byte{'', ''})
+- if err := stdinPipe.Close(); err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- // wait for CmdRun to return
+- setTimeout(t, "Waiting for CmdAttach timed out", 5*time.Second, func() {
+- <-ch
+- })
+-
+- time.Sleep(500 * time.Millisecond)
+- if !container.State.Running {
+- t.Fatal("The detached container should be still running")
+- }
+-
+- setTimeout(t, "Waiting for container to die timedout", 5*time.Second, func() {
+- container.Kill()
+- container.Wait()
+- })
+-}
+-
+ // Expected behaviour, the process stays alive when the client disconnects
+ func TestAttachDisconnect(t *testing.T) {
+ stdin, stdinPipe := io.Pipe()
+diff -uNr docker-0.6.3/container.go docker/container.go
+--- docker-0.6.3/container.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/container.go 2013-09-26 14:37:16.140935736 -0500
+@@ -146,9 +146,7 @@
+ flVolumes := NewPathOpts()
+ cmd.Var(flVolumes, "v", "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)")
+
+- var flVolumesFrom ListOpts
+- cmd.Var(&flVolumesFrom, "volumes-from", "Mount volumes from the specified container")
+-
++ flVolumesFrom := cmd.String("volumes-from", "", "Mount volumes from the specified container")
+ flEntrypoint := cmd.String("entrypoint", "", "Overwrite the default entrypoint of the image")
+
+ var flLxcOpts ListOpts
+@@ -233,7 +231,7 @@
+ Dns: flDns,
+ Image: image,
+ Volumes: flVolumes,
+- VolumesFrom: strings.Join(flVolumesFrom, ","),
++ VolumesFrom: *flVolumesFrom,
+ Entrypoint: entrypoint,
+ Privileged: *flPrivileged,
+ WorkingDir: *flWorkingDir,
+@@ -292,12 +290,17 @@
// Inject the io.Reader at the given path. Note: do not close the reader
func (container *Container) Inject(file io.Reader, pth string) error {
@@ -1058,7 +1320,7 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
if err != nil {
return err
}
-@@ -564,7 +569,7 @@
+@@ -566,7 +569,7 @@
container.State.Lock()
defer container.State.Unlock()
@@ -1067,36 +1329,96 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
hostConfig, _ = container.ReadHostConfig()
}
-@@ -648,7 +653,7 @@
- continue
+@@ -641,25 +644,21 @@
+
+ // Apply volumes from another container if requested
+ if container.Config.VolumesFrom != "" {
+- volumes := strings.Split(container.Config.VolumesFrom, ",")
+- for _, v := range volumes {
+- c := container.runtime.Get(v)
+- if c == nil {
+- return fmt.Errorf("Container %s not found. Impossible to mount its volumes", container.ID)
++ c := container.runtime.Get(container.Config.VolumesFrom)
++ if c == nil {
++ return fmt.Errorf("Container %s not found. Impossible to mount its volumes", container.ID)
++ }
++ for volPath, id := range c.Volumes {
++ if _, exists := container.Volumes[volPath]; exists {
++ continue
}
- if err := os.MkdirAll(path.Join(container.RootfsPath(), volPath), 0755); err != nil {
-- return err
+- for volPath, id := range c.Volumes {
+- if _, exists := container.Volumes[volPath]; exists {
+- continue
+- }
+- if err := os.MkdirAll(path.Join(container.RootfsPath(), volPath), 0755); err != nil {
+- return err
+- }
+- container.Volumes[volPath] = id
+- if isRW, exists := c.VolumesRW[volPath]; exists {
+- container.VolumesRW[volPath] = isRW
+- }
++ if err := os.MkdirAll(path.Join(container.RootfsPath(), volPath), 0755); err != nil {
+ return nil
++ }
++ container.Volumes[volPath] = id
++ if isRW, exists := c.VolumesRW[volPath]; exists {
++ container.VolumesRW[volPath] = isRW
}
- container.Volumes[volPath] = id
- if isRW, exists := c.VolumesRW[volPath]; exists {
-@@ -707,19 +712,6 @@
+-
+ }
+ }
+
+@@ -671,11 +670,9 @@
+ continue
+ }
+ var srcPath string
+- var isBindMount bool
+ srcRW := false
+ // If an external bind is defined for this volume, use that as a source
+ if bindMap, exists := binds[volPath]; exists {
+- isBindMount = true
+ srcPath = bindMap.SrcPath
+ if strings.ToLower(bindMap.Mode) == "rw" {
+ srcRW = true
+@@ -699,9 +696,7 @@
+ if err := os.MkdirAll(rootVolPath, 0755); err != nil {
+ return nil
+ }
+-
+- // Do not copy or change permissions if we are mounting from the host
+- if srcRW && !isBindMount {
++ if srcRW {
+ volList, err := ioutil.ReadDir(rootVolPath)
+ if err != nil {
+ return err
+@@ -712,26 +707,9 @@
+ return err
+ }
+ if len(srcList) == 0 {
+- // If the source volume is empty copy files from the root into the volume
+ if err := CopyWithTar(rootVolPath, srcPath); err != nil {
+ return err
}
+-
+- var stat syscall.Stat_t
+- if err := syscall.Stat(rootVolPath, &stat); err != nil {
+- return err
+- }
+- var srcStat syscall.Stat_t
+- if err := syscall.Stat(srcPath, &srcStat); err != nil {
+- return err
+- }
+- // Change the source volume's ownership if it differs from the root
+- // files that where just copied
+- if stat.Uid != srcStat.Uid || stat.Gid != srcStat.Gid {
+- if err := os.Chown(srcPath, int(stat.Uid), int(stat.Gid)); err != nil {
+- return err
+- }
+- }
}
}
-- var stat syscall.Stat_t
-- if err := syscall.Stat(rootVolPath, &stat); err != nil {
-- return err
-- }
-- var srcStat syscall.Stat_t
-- if err := syscall.Stat(srcPath, &srcStat); err != nil {
-- return err
-- }
-- if stat.Uid != srcStat.Uid || stat.Gid != srcStat.Gid {
-- if err := os.Chown(srcPath, int(stat.Uid), int(stat.Gid)); err != nil {
-- return err
-- }
-- }
}
- }
-
-@@ -728,6 +720,7 @@
+@@ -742,6 +720,7 @@
}
params := []string{
@@ -1104,7 +1426,7 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
"-n", container.ID,
"-f", container.lxcConfigPath(),
"--",
-@@ -776,7 +769,21 @@
+@@ -790,7 +769,21 @@
params = append(params, "--", container.Path)
params = append(params, container.Args...)
@@ -1127,7 +1449,40 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
// Setup logging of stdout and stderr to disk
if err := container.runtime.LogToDisk(container.stdout, container.logPath("json"), "stdout"); err != nil {
-@@ -1092,7 +1099,15 @@
+@@ -964,19 +957,14 @@
+ }
+ }
+ utils.Debugf("Process finished")
+-
++ if container.runtime != nil && container.runtime.srv != nil {
++ container.runtime.srv.LogEvent("die", container.ShortID(), container.runtime.repositories.ImageName(container.Image))
++ }
+ exitCode := -1
+ if container.cmd != nil {
+ exitCode = container.cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus()
+ }
+
+- // Report status back
+- container.State.setStopped(exitCode)
+-
+- if container.runtime != nil && container.runtime.srv != nil {
+- container.runtime.srv.LogEvent("die", container.ShortID(), container.runtime.repositories.ImageName(container.Image))
+- }
+-
+ // Cleanup
+ container.releaseNetwork()
+ if container.Config.OpenStdin {
+@@ -1006,6 +994,9 @@
+ container.stdin, container.stdinPipe = io.Pipe()
+ }
+
++ // Report status back
++ container.State.setStopped(exitCode)
++
+ // Release the lock
+ close(container.waitLock)
+
+@@ -1108,7 +1099,15 @@
}
func (container *Container) ExportRw() (Archive, error) {
@@ -1144,7 +1499,7 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
}
func (container *Container) RwChecksum() (string, error) {
-@@ -1134,20 +1149,33 @@
+@@ -1150,20 +1149,33 @@
return container.Mount()
}
@@ -1180,7 +1535,7 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
}
func (container *Container) GetImage() (*Image, error) {
-@@ -1158,11 +1186,20 @@
+@@ -1174,11 +1186,20 @@
}
func (container *Container) Mounted() (bool, error) {
@@ -1203,17 +1558,17 @@ diff -uNr docker-0.6.2/container.go docker-devmapper/container.go
}
// ShortID returns a shorthand version of the container's id for convenience.
-@@ -1250,5 +1287,5 @@
+@@ -1266,5 +1287,5 @@
filter = []string{path.Base(basePath)}
basePath = path.Dir(basePath)
}
- return TarFilter(basePath, Uncompressed, filter)
+ return TarFilter(basePath, Uncompressed, filter, true, nil)
}
-diff -uNr docker-0.6.2/container_test.go docker-devmapper/container_test.go
---- docker-0.6.2/container_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/container_test.go 2013-09-23 10:37:38.668306983 -0500
-@@ -1196,51 +1196,6 @@
+diff -uNr docker-0.6.3/container_test.go docker/container_test.go
+--- docker-0.6.3/container_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/container_test.go 2013-09-26 14:37:16.141935732 -0500
+@@ -1196,43 +1196,6 @@
return tmpDir
}
@@ -1223,7 +1578,7 @@ diff -uNr docker-0.6.2/container_test.go docker-devmapper/container_test.go
- defer nuke(r)
-
- // Add directory not owned by root
-- container1, _, _ := mkContainer(r, []string{"_", "/bin/sh", "-c", "mkdir -p /hello && chown daemon.daemon /hello"}, t)
+- container1, _, _ := mkContainer(r, []string{"_", "/bin/sh", "-c", "mkdir -p /hello && touch /hello/test.txt && chown daemon.daemon /hello"}, t)
- defer r.Destroy(container1)
-
- if container1.State.Running {
@@ -1248,26 +1603,140 @@ diff -uNr docker-0.6.2/container_test.go docker-devmapper/container_test.go
- // Test that the uid and gid is copied from the image to the volume
- tmpDir1 := tempDir(t)
- defer os.RemoveAll(tmpDir1)
-- stdout1, _ := runContainer(r, []string{"-v", fmt.Sprintf("%s:/hello", tmpDir1), img.ID, "stat", "-c", "%U %G", "/hello"}, t)
+- stdout1, _ := runContainer(r, []string{"-v", "/hello", img.ID, "stat", "-c", "%U %G", "/hello"}, t)
- if !strings.Contains(stdout1, "daemon daemon") {
- t.Fatal("Container failed to transfer uid and gid to volume")
- }
--
-- // Test that the uid and gid is not copied from the image when the volume is read only
-- tmpDir2 := tempDir(t)
-- defer os.RemoveAll(tmpDir1)
-- stdout2, _ := runContainer(r, []string{"-v", fmt.Sprintf("%s:/hello:ro", tmpDir2), img.ID, "stat", "-c", "%U %G", "/hello"}, t)
-- if strings.Contains(stdout2, "daemon daemon") {
-- t.Fatal("Container transfered uid and gid to volume")
-- }
-}
-
// Test for #1582
func TestCopyVolumeContent(t *testing.T) {
r := mkRuntime(t)
-diff -uNr docker-0.6.2/contrib/docker.bash docker-devmapper/contrib/docker.bash
---- docker-0.6.2/contrib/docker.bash 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/contrib/docker.bash 2013-09-23 10:37:38.589307202 -0500
+@@ -1264,10 +1227,27 @@
+ // Test that the content is copied from the image to the volume
+ tmpDir1 := tempDir(t)
+ defer os.RemoveAll(tmpDir1)
+- stdout1, _ := runContainer(r, []string{"-v", "/hello", img.ID, "find", "/hello"}, t)
++ stdout1, _ := runContainer(r, []string{"-v", fmt.Sprintf("%s:/hello", tmpDir1), img.ID, "find", "/hello"}, t)
+ if !(strings.Contains(stdout1, "/hello/local/world") && strings.Contains(stdout1, "/hello/local")) {
+ t.Fatal("Container failed to transfer content to volume")
+ }
++
++ // Test that the content is not copied when the volume is readonly
++ tmpDir2 := tempDir(t)
++ defer os.RemoveAll(tmpDir2)
++ stdout2, _ := runContainer(r, []string{"-v", fmt.Sprintf("%s:/hello:ro", tmpDir2), img.ID, "find", "/hello"}, t)
++ if strings.Contains(stdout2, "/hello/local/world") || strings.Contains(stdout2, "/hello/local") {
++ t.Fatal("Container transfered content to readonly volume")
++ }
++
++ // Test that the content is not copied when the volume is non-empty
++ tmpDir3 := tempDir(t)
++ defer os.RemoveAll(tmpDir3)
++ writeFile(path.Join(tmpDir3, "touch-me"), "", t)
++ stdout3, _ := runContainer(r, []string{"-v", fmt.Sprintf("%s:/hello:rw", tmpDir3), img.ID, "find", "/hello"}, t)
++ if strings.Contains(stdout3, "/hello/local/world") || strings.Contains(stdout3, "/hello/local") || !strings.Contains(stdout3, "/hello/touch-me") {
++ t.Fatal("Container transfered content to non-empty volume")
++ }
+ }
+
+ func TestBindMounts(t *testing.T) {
+@@ -1524,80 +1504,3 @@
+ t.Fatal("Could mount into secure container")
+ }
+ }
+-
+-func TestMultipleVolumesFrom(t *testing.T) {
+- runtime := mkRuntime(t)
+- defer nuke(runtime)
+-
+- container, err := runtime.Create(&Config{
+- Image: GetTestImage(runtime).ID,
+- Cmd: []string{"sh", "-c", "echo -n bar > /test/foo"},
+- Volumes: map[string]struct{}{"/test": {}},
+- },
+- )
+- if err != nil {
+- t.Fatal(err)
+- }
+- defer runtime.Destroy(container)
+-
+- for key := range container.Config.Volumes {
+- if key != "/test" {
+- t.Fail()
+- }
+- }
+-
+- _, err = container.Output()
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- expected := container.Volumes["/test"]
+- if expected == "" {
+- t.Fail()
+- }
+-
+- container2, err := runtime.Create(
+- &Config{
+- Image: GetTestImage(runtime).ID,
+- Cmd: []string{"sh", "-c", "echo -n bar > /other/foo"},
+- Volumes: map[string]struct{}{"/other": {}},
+- },
+- )
+- if err != nil {
+- t.Fatal(err)
+- }
+- defer runtime.Destroy(container2)
+-
+- for key := range container2.Config.Volumes {
+- if key != "/other" {
+- t.FailNow()
+- }
+- }
+- if _, err := container2.Output(); err != nil {
+- t.Fatal(err)
+- }
+-
+- container3, err := runtime.Create(
+- &Config{
+- Image: GetTestImage(runtime).ID,
+- Cmd: []string{"/bin/echo", "-n", "foobar"},
+- VolumesFrom: strings.Join([]string{container.ID, container2.ID}, ","),
+- })
+-
+- if err != nil {
+- t.Fatal(err)
+- }
+- defer runtime.Destroy(container3)
+-
+- if _, err := container3.Output(); err != nil {
+- t.Fatal(err)
+- }
+-
+- t.Log(container3.Volumes)
+- if container3.Volumes["/test"] != container.Volumes["/test"] {
+- t.Fail()
+- }
+- if container3.Volumes["/other"] != container2.Volumes["/other"] {
+- t.Fail()
+- }
+-}
+diff -uNr docker-0.6.3/contrib/crashTest.go docker/contrib/crashTest.go
+--- docker-0.6.3/contrib/crashTest.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/contrib/crashTest.go 2013-09-26 14:37:02.929991325 -0500
+@@ -77,7 +77,7 @@
+ stop = false
+ for i := 0; i < 100 && !stop; {
+ func() error {
+- cmd := exec.Command(DOCKERPATH, "run", "ubuntu", "echo", fmt.Sprintf("%d", totalTestCount))
++ cmd := exec.Command(DOCKERPATH, "run", "base", "echo", fmt.Sprintf("%d", totalTestCount))
+ i++
+ totalTestCount++
+ outPipe, err := cmd.StdoutPipe()
+diff -uNr docker-0.6.3/contrib/docker.bash docker/contrib/docker.bash
+--- docker-0.6.3/contrib/docker.bash 2013-09-23 13:29:11.000000000 -0500
++++ docker/contrib/docker.bash 2013-09-26 14:37:16.141935732 -0500
@@ -114,7 +114,7 @@
case "$cur" in
@@ -1277,9 +1746,16 @@ diff -uNr docker-0.6.2/contrib/docker.bash docker-devmapper/contrib/docker.bash
;;
*)
_filedir
-diff -uNr docker-0.6.2/deviceset.go docker-devmapper/deviceset.go
---- docker-0.6.2/deviceset.go 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/deviceset.go 2013-09-23 10:37:39.131305695 -0500
+diff -uNr docker-0.6.3/contrib/MAINTAINERS docker/contrib/MAINTAINERS
+--- docker-0.6.3/contrib/MAINTAINERS 2013-09-23 13:29:11.000000000 -0500
++++ docker/contrib/MAINTAINERS 2013-09-26 14:37:16.141935732 -0500
+@@ -1,2 +1 @@
+-Kawsar Saiyeed <kawsar.saiyeed at projiris.com> (@KSid)
+-Tianon Gravi <admwiggin at gmail.com> (@tianon)
++Kawsar Saiyeed <kawsar.saiyeed at projiris.com>
+diff -uNr docker-0.6.3/deviceset.go docker/deviceset.go
+--- docker-0.6.3/deviceset.go 1969-12-31 18:00:00.000000000 -0600
++++ docker/deviceset.go 2013-09-26 14:37:16.142935727 -0500
@@ -0,0 +1,75 @@
+package docker
+
@@ -1356,9 +1832,9 @@ diff -uNr docker-0.6.2/deviceset.go docker-devmapper/deviceset.go
+ }
+ return wrapper
+}
-diff -uNr docker-0.6.2/devmapper/deviceset_devmapper.go docker-devmapper/devmapper/deviceset_devmapper.go
---- docker-0.6.2/devmapper/deviceset_devmapper.go 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/devmapper/deviceset_devmapper.go 2013-09-23 10:37:39.249305367 -0500
+diff -uNr docker-0.6.3/devmapper/deviceset_devmapper.go docker/devmapper/deviceset_devmapper.go
+--- docker-0.6.3/devmapper/deviceset_devmapper.go 1969-12-31 18:00:00.000000000 -0600
++++ docker/devmapper/deviceset_devmapper.go 2013-09-26 14:37:16.142935727 -0500
@@ -0,0 +1,919 @@
+package devmapper
+
@@ -2279,9 +2755,9 @@ diff -uNr docker-0.6.2/devmapper/deviceset_devmapper.go docker-devmapper/devmapp
+
+ return devices
+}
-diff -uNr docker-0.6.2/devmapper/devmapper.go docker-devmapper/devmapper/devmapper.go
---- docker-0.6.2/devmapper/devmapper.go 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/devmapper/devmapper.go 2013-09-23 10:37:39.248305370 -0500
+diff -uNr docker-0.6.3/devmapper/devmapper.go docker/devmapper/devmapper.go
+--- docker-0.6.3/devmapper/devmapper.go 1969-12-31 18:00:00.000000000 -0600
++++ docker/devmapper/devmapper.go 2013-09-26 14:37:16.142935727 -0500
@@ -0,0 +1,366 @@
+package devmapper
+
@@ -2649,9 +3125,9 @@ diff -uNr docker-0.6.2/devmapper/devmapper.go docker-devmapper/devmapper/devmapp
+ }
+ return nil
+}
-diff -uNr docker-0.6.2/devmapper/docker-device-tool/device_tool.go docker-devmapper/devmapper/docker-device-tool/device_tool.go
---- docker-0.6.2/devmapper/docker-device-tool/device_tool.go 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/devmapper/docker-device-tool/device_tool.go 2013-09-23 10:37:39.260305337 -0500
+diff -uNr docker-0.6.3/devmapper/docker-device-tool/device_tool.go docker/devmapper/docker-device-tool/device_tool.go
+--- docker-0.6.3/devmapper/docker-device-tool/device_tool.go 1969-12-31 18:00:00.000000000 -0600
++++ docker/devmapper/docker-device-tool/device_tool.go 2013-09-26 14:37:16.143935723 -0500
@@ -0,0 +1,62 @@
+package main
+
@@ -2715,9 +3191,9 @@ diff -uNr docker-0.6.2/devmapper/docker-device-tool/device_tool.go docker-devmap
+
+ return
+}
-diff -uNr docker-0.6.2/docker/docker.go docker-devmapper/docker/docker.go
---- docker-0.6.2/docker/docker.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docker/docker.go 2013-09-23 10:37:38.659307008 -0500
+diff -uNr docker-0.6.3/docker/docker.go docker/docker/docker.go
+--- docker-0.6.3/docker/docker.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/docker/docker.go 2013-09-26 14:37:16.143935723 -0500
@@ -4,6 +4,7 @@
"flag"
"fmt"
@@ -2735,9 +3211,9 @@ diff -uNr docker-0.6.2/docker/docker.go docker-devmapper/docker/docker.go
if err != nil {
return err
}
-diff -uNr docker-0.6.2/Dockerfile docker-devmapper/Dockerfile
---- docker-0.6.2/Dockerfile 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/Dockerfile 2013-09-23 10:37:38.647307041 -0500
+diff -uNr docker-0.6.3/Dockerfile docker/Dockerfile
+--- docker-0.6.3/Dockerfile 2013-09-23 13:29:11.000000000 -0500
++++ docker/Dockerfile 2013-09-26 14:37:16.134935761 -0500
@@ -1,29 +1,5 @@
# This file describes the standard way to build Docker, using docker
-#
@@ -2801,9 +3277,9 @@ diff -uNr docker-0.6.2/Dockerfile docker-devmapper/Dockerfile
+# Build the binary
+run cd /go/src/github.com/dotcloud/docker && hack/release/make.sh
+cmd cd /go/src/github.com/dotcloud/docker && hack/release/release.sh
-diff -uNr docker-0.6.2/docker-init/docker-init.go docker-devmapper/docker-init/docker-init.go
---- docker-0.6.2/docker-init/docker-init.go 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/docker-init/docker-init.go 2013-09-23 10:37:39.486304708 -0500
+diff -uNr docker-0.6.3/docker-init/docker-init.go docker/docker-init/docker-init.go
+--- docker-0.6.3/docker-init/docker-init.go 1969-12-31 18:00:00.000000000 -0600
++++ docker/docker-init/docker-init.go 2013-09-26 14:37:16.143935723 -0500
@@ -0,0 +1,16 @@
+package main
+
@@ -2821,9 +3297,626 @@ diff -uNr docker-0.6.2/docker-init/docker-init.go docker-devmapper/docker-init/d
+ docker.SysInit()
+ return
+}
-diff -uNr docker-0.6.2/docs/sources/api/docker_remote_api_v1.4.rst docker-devmapper/docs/sources/api/docker_remote_api_v1.4.rst
---- docker-0.6.2/docs/sources/api/docker_remote_api_v1.4.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/api/docker_remote_api_v1.4.rst 2013-09-23 10:37:38.945306212 -0500
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api.rst docker/docs/sources/api/docker_remote_api.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api.rst 2013-09-26 14:37:16.144935718 -0500
+@@ -65,7 +65,7 @@
+
+ .. http:post:: /images/create
+
+- **New!** When pulling a repo, all images are now downloaded in parallel.
++ **New!** When pull a repo, all images are now downloaded in parallel.
+
+ .. http:get:: /containers/(id)/top
+
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api_v1.0.rst docker/docs/sources/api/docker_remote_api_v1.0.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api_v1.0.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api_v1.0.rst 2013-09-26 14:37:02.933991308 -0500
+@@ -49,28 +49,28 @@
+ [
+ {
+ "Id": "8dfafdbc3a40",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 1",
+ "Created": 1367854155,
+ "Status": "Exit 0"
+ },
+ {
+ "Id": "9cd87474be90",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 222222",
+ "Created": 1367854155,
+ "Status": "Exit 0"
+ },
+ {
+ "Id": "3176a2479c92",
+- "Image": "centos:latest",
++ "Image": "base:latest",
+ "Command": "echo 3333333333333333",
+ "Created": 1367854154,
+ "Status": "Exit 0"
+ },
+ {
+ "Id": "4cb07b47f9fb",
+- "Image": "fedora:latest",
++ "Image": "base:latest",
+ "Command": "echo 444444444444444444444444444444444",
+ "Created": 1367854152,
+ "Status": "Exit 0"
+@@ -117,7 +117,7 @@
+ "date"
+ ],
+ "Dns":null,
+- "Image":"ubuntu",
++ "Image":"base",
+ "Volumes":{},
+ "VolumesFrom":""
+ }
+@@ -183,7 +183,7 @@
+ "date"
+ ],
+ "Dns": null,
+- "Image": "ubuntu",
++ "Image": "base",
+ "Volumes": {},
+ "VolumesFrom": ""
+ },
+@@ -490,14 +490,14 @@
+
+ [
+ {
+- "Repository":"ubuntu",
+- "Tag":"precise",
++ "Repository":"base",
++ "Tag":"ubuntu-12.10",
+ "Id":"b750fe79269d",
+ "Created":1364102658
+ },
+ {
+- "Repository":"ubuntu",
+- "Tag":"12.04",
++ "Repository":"base",
++ "Tag":"ubuntu-quantal",
+ "Id":"b750fe79269d",
+ "Created":1364102658
+ }
+@@ -529,9 +529,9 @@
+ "d6434d954665" -> "d82cbacda43a"
+ base -> "e9aa60c60128" [style=invis]
+ "074be284591f" -> "f71189fff3de"
+- "b750fe79269d" [label="b750fe79269d\nubuntu",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "e9aa60c60128" [label="e9aa60c60128\ncentos",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "9a33b36209ed" [label="9a33b36209ed\nfedora",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "b750fe79269d" [label="b750fe79269d\nbase",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "e9aa60c60128" [label="e9aa60c60128\nbase2",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "9a33b36209ed" [label="9a33b36209ed\ntest",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+ base [style=invisible]
+ }
+
+@@ -552,7 +552,7 @@
+
+ .. sourcecode:: http
+
+- POST /images/create?fromImage=ubuntu HTTP/1.1
++ POST /images/create?fromImage=base HTTP/1.1
+
+ **Example response**:
+
+@@ -572,8 +572,8 @@
+ :statuscode 500: server error
+
+
+-Insert a file in an image
+-*************************
++Insert a file in a image
++************************
+
+ .. http:post:: /images/(name)/insert
+
+@@ -608,7 +608,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/centos/json HTTP/1.1
++ GET /images/base/json HTTP/1.1
+
+ **Example response**:
+
+@@ -638,7 +638,7 @@
+ "Env":null,
+ "Cmd": ["/bin/bash"]
+ ,"Dns":null,
+- "Image":"centos",
++ "Image":"base",
+ "Volumes":null,
+ "VolumesFrom":""
+ }
+@@ -660,7 +660,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/fedora/history HTTP/1.1
++ GET /images/base/history HTTP/1.1
+
+ **Example response**:
+
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api_v1.1.rst docker/docs/sources/api/docker_remote_api_v1.1.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api_v1.1.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api_v1.1.rst 2013-09-26 14:37:02.934991304 -0500
+@@ -49,28 +49,28 @@
+ [
+ {
+ "Id": "8dfafdbc3a40",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 1",
+ "Created": 1367854155,
+ "Status": "Exit 0"
+ },
+ {
+ "Id": "9cd87474be90",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 222222",
+ "Created": 1367854155,
+ "Status": "Exit 0"
+ },
+ {
+ "Id": "3176a2479c92",
+- "Image": "centos:latest",
++ "Image": "base:latest",
+ "Command": "echo 3333333333333333",
+ "Created": 1367854154,
+ "Status": "Exit 0"
+ },
+ {
+ "Id": "4cb07b47f9fb",
+- "Image": "fedora:latest",
++ "Image": "base:latest",
+ "Command": "echo 444444444444444444444444444444444",
+ "Created": 1367854152,
+ "Status": "Exit 0"
+@@ -117,7 +117,7 @@
+ "date"
+ ],
+ "Dns":null,
+- "Image":"ubuntu",
++ "Image":"base",
+ "Volumes":{},
+ "VolumesFrom":""
+ }
+@@ -183,7 +183,7 @@
+ "date"
+ ],
+ "Dns": null,
+- "Image": "ubuntu",
++ "Image": "base",
+ "Volumes": {},
+ "VolumesFrom": ""
+ },
+@@ -490,14 +490,14 @@
+
+ [
+ {
+- "Repository":"ubuntu",
+- "Tag":"precise",
++ "Repository":"base",
++ "Tag":"ubuntu-12.10",
+ "Id":"b750fe79269d",
+ "Created":1364102658
+ },
+ {
+- "Repository":"ubuntu",
+- "Tag":"12.04",
++ "Repository":"base",
++ "Tag":"ubuntu-quantal",
+ "Id":"b750fe79269d",
+ "Created":1364102658
+ }
+@@ -529,9 +529,9 @@
+ "d6434d954665" -> "d82cbacda43a"
+ base -> "e9aa60c60128" [style=invis]
+ "074be284591f" -> "f71189fff3de"
+- "b750fe79269d" [label="b750fe79269d\nubuntu",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "e9aa60c60128" [label="e9aa60c60128\ncentos",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "9a33b36209ed" [label="9a33b36209ed\nfedora",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "b750fe79269d" [label="b750fe79269d\nbase",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "e9aa60c60128" [label="e9aa60c60128\nbase2",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "9a33b36209ed" [label="9a33b36209ed\ntest",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+ base [style=invisible]
+ }
+
+@@ -552,7 +552,7 @@
+
+ .. sourcecode:: http
+
+- POST /images/create?fromImage=ubuntu HTTP/1.1
++ POST /images/create?fromImage=base HTTP/1.1
+
+ **Example response**:
+
+@@ -575,8 +575,8 @@
+ :statuscode 500: server error
+
+
+-Insert a file in an image
+-*************************
++Insert a file in a image
++************************
+
+ .. http:post:: /images/(name)/insert
+
+@@ -615,7 +615,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/centos/json HTTP/1.1
++ GET /images/base/json HTTP/1.1
+
+ **Example response**:
+
+@@ -645,7 +645,7 @@
+ "Env":null,
+ "Cmd": ["/bin/bash"]
+ ,"Dns":null,
+- "Image":"centos",
++ "Image":"base",
+ "Volumes":null,
+ "VolumesFrom":""
+ }
+@@ -667,7 +667,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/fedora/history HTTP/1.1
++ GET /images/base/history HTTP/1.1
+
+ **Example response**:
+
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api_v1.2.rst docker/docs/sources/api/docker_remote_api_v1.2.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api_v1.2.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api_v1.2.rst 2013-09-26 14:37:02.934991304 -0500
+@@ -49,7 +49,7 @@
+ [
+ {
+ "Id": "8dfafdbc3a40",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 1",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -59,7 +59,7 @@
+ },
+ {
+ "Id": "9cd87474be90",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 222222",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -69,7 +69,7 @@
+ },
+ {
+ "Id": "3176a2479c92",
+- "Image": "centos:latest",
++ "Image": "base:latest",
+ "Command": "echo 3333333333333333",
+ "Created": 1367854154,
+ "Status": "Exit 0",
+@@ -79,7 +79,7 @@
+ },
+ {
+ "Id": "4cb07b47f9fb",
+- "Image": "fedora:latest",
++ "Image": "base:latest",
+ "Command": "echo 444444444444444444444444444444444",
+ "Created": 1367854152,
+ "Status": "Exit 0",
+@@ -129,7 +129,7 @@
+ "date"
+ ],
+ "Dns":null,
+- "Image":"ubuntu",
++ "Image":"base",
+ "Volumes":{},
+ "VolumesFrom":""
+ }
+@@ -195,7 +195,7 @@
+ "date"
+ ],
+ "Dns": null,
+- "Image": "ubuntu",
++ "Image": "base",
+ "Volumes": {},
+ "VolumesFrom": ""
+ },
+@@ -502,16 +502,16 @@
+
+ [
+ {
+- "Repository":"ubuntu",
+- "Tag":"precise",
++ "Repository":"base",
++ "Tag":"ubuntu-12.10",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+ "VirtualSize":180116135
+ },
+ {
+- "Repository":"ubuntu",
+- "Tag":"12.04",
++ "Repository":"base",
++ "Tag":"ubuntu-quantal",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+@@ -545,9 +545,9 @@
+ "d6434d954665" -> "d82cbacda43a"
+ base -> "e9aa60c60128" [style=invis]
+ "074be284591f" -> "f71189fff3de"
+- "b750fe79269d" [label="b750fe79269d\nubuntu",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "e9aa60c60128" [label="e9aa60c60128\ncentos",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "9a33b36209ed" [label="9a33b36209ed\nfedora",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "b750fe79269d" [label="b750fe79269d\nbase",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "e9aa60c60128" [label="e9aa60c60128\nbase2",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "9a33b36209ed" [label="9a33b36209ed\ntest",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+ base [style=invisible]
+ }
+
+@@ -568,7 +568,7 @@
+
+ .. sourcecode:: http
+
+- POST /images/create?fromImage=ubuntu HTTP/1.1
++ POST /images/create?fromImage=base HTTP/1.1
+
+ **Example response**:
+
+@@ -591,8 +591,8 @@
+ :statuscode 500: server error
+
+
+-Insert a file in an image
+-*************************
++Insert a file in a image
++************************
+
+ .. http:post:: /images/(name)/insert
+
+@@ -631,7 +631,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/centos/json HTTP/1.1
++ GET /images/base/json HTTP/1.1
+
+ **Example response**:
+
+@@ -661,7 +661,7 @@
+ "Env":null,
+ "Cmd": ["/bin/bash"]
+ ,"Dns":null,
+- "Image":"centos",
++ "Image":"base",
+ "Volumes":null,
+ "VolumesFrom":""
+ },
+@@ -684,7 +684,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/fedora/history HTTP/1.1
++ GET /images/base/history HTTP/1.1
+
+ **Example response**:
+
+@@ -696,7 +696,7 @@
+ [
+ {
+ "Id":"b750fe79269d",
+- "Tag":["ubuntu:latest"],
++ "Tag":["base:latest"],
+ "Created":1364102658,
+ "CreatedBy":"/bin/bash"
+ },
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api_v1.3.rst docker/docs/sources/api/docker_remote_api_v1.3.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api_v1.3.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api_v1.3.rst 2013-09-26 14:37:02.934991304 -0500
+@@ -49,7 +49,7 @@
+ [
+ {
+ "Id": "8dfafdbc3a40",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 1",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -59,7 +59,7 @@
+ },
+ {
+ "Id": "9cd87474be90",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 222222",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -69,7 +69,7 @@
+ },
+ {
+ "Id": "3176a2479c92",
+- "Image": "centos:latest",
++ "Image": "base:latest",
+ "Command": "echo 3333333333333333",
+ "Created": 1367854154,
+ "Status": "Exit 0",
+@@ -79,7 +79,7 @@
+ },
+ {
+ "Id": "4cb07b47f9fb",
+- "Image": "fedora:latest",
++ "Image": "base:latest",
+ "Command": "echo 444444444444444444444444444444444",
+ "Created": 1367854152,
+ "Status": "Exit 0",
+@@ -130,7 +130,7 @@
+ "date"
+ ],
+ "Dns":null,
+- "Image":"ubuntu",
++ "Image":"base",
+ "Volumes":{},
+ "VolumesFrom":""
+ }
+@@ -196,7 +196,7 @@
+ "date"
+ ],
+ "Dns": null,
+- "Image": "ubuntu",
++ "Image": "base",
+ "Volumes": {},
+ "VolumesFrom": ""
+ },
+@@ -550,16 +550,16 @@
+
+ [
+ {
+- "Repository":"ubuntu",
+- "Tag":"precise",
++ "Repository":"base",
++ "Tag":"ubuntu-12.10",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+ "VirtualSize":180116135
+ },
+ {
+- "Repository":"ubuntu",
+- "Tag":"12.04",
++ "Repository":"base",
++ "Tag":"ubuntu-quantal",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+@@ -593,9 +593,9 @@
+ "d6434d954665" -> "d82cbacda43a"
+ base -> "e9aa60c60128" [style=invis]
+ "074be284591f" -> "f71189fff3de"
+- "b750fe79269d" [label="b750fe79269d\nubuntu",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "e9aa60c60128" [label="e9aa60c60128\ncentos",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "9a33b36209ed" [label="9a33b36209ed\nfedora",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "b750fe79269d" [label="b750fe79269d\nbase",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "e9aa60c60128" [label="e9aa60c60128\nbase2",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "9a33b36209ed" [label="9a33b36209ed\ntest",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+ base [style=invisible]
+ }
+
+@@ -616,7 +616,7 @@
+
+ .. sourcecode:: http
+
+- POST /images/create?fromImage=ubuntu HTTP/1.1
++ POST /images/create?fromImage=base HTTP/1.1
+
+ **Example response**:
+
+@@ -639,8 +639,8 @@
+ :statuscode 500: server error
+
+
+-Insert a file in an image
+-*************************
++Insert a file in a image
++************************
+
+ .. http:post:: /images/(name)/insert
+
+@@ -679,7 +679,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/centos/json HTTP/1.1
++ GET /images/base/json HTTP/1.1
+
+ **Example response**:
+
+@@ -709,7 +709,7 @@
+ "Env":null,
+ "Cmd": ["/bin/bash"]
+ ,"Dns":null,
+- "Image":"centos",
++ "Image":"base",
+ "Volumes":null,
+ "VolumesFrom":""
+ },
+@@ -732,7 +732,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/fedora/history HTTP/1.1
++ GET /images/base/history HTTP/1.1
+
+ **Example response**:
+
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api_v1.4.rst docker/docs/sources/api/docker_remote_api_v1.4.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api_v1.4.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api_v1.4.rst 2013-09-26 14:37:16.144935718 -0500
+@@ -46,7 +46,7 @@
+ [
+ {
+ "Id": "8dfafdbc3a40",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 1",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -56,7 +56,7 @@
+ },
+ {
+ "Id": "9cd87474be90",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 222222",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -66,7 +66,7 @@
+ },
+ {
+ "Id": "3176a2479c92",
+- "Image": "centos:latest",
++ "Image": "base:latest",
+ "Command": "echo 3333333333333333",
+ "Created": 1367854154,
+ "Status": "Exit 0",
+@@ -76,7 +76,7 @@
+ },
+ {
+ "Id": "4cb07b47f9fb",
+- "Image": "fedora:latest",
++ "Image": "base:latest",
+ "Command": "echo 444444444444444444444444444444444",
+ "Created": 1367854152,
+ "Status": "Exit 0",
+@@ -128,7 +128,7 @@
+ "date"
+ ],
+ "Dns":null,
+- "Image":"ubuntu",
++ "Image":"base",
+ "Volumes":{},
+ "VolumesFrom":"",
+ "WorkingDir":""
+@@ -196,7 +196,7 @@
+ "date"
+ ],
+ "Dns": null,
+- "Image": "ubuntu",
++ "Image": "base",
+ "Volumes": {},
+ "VolumesFrom": "",
+ "WorkingDir":""
@@ -359,7 +359,7 @@
{
@@ -2833,9 +3926,148 @@ diff -uNr docker-0.6.2/docs/sources/api/docker_remote_api_v1.4.rst docker-devmap
}
**Example response**:
-diff -uNr docker-0.6.2/docs/sources/api/docker_remote_api_v1.5.rst docker-devmapper/docs/sources/api/docker_remote_api_v1.5.rst
---- docker-0.6.2/docs/sources/api/docker_remote_api_v1.5.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/api/docker_remote_api_v1.5.rst 2013-09-23 10:37:38.924306271 -0500
+@@ -592,16 +592,16 @@
+
+ [
+ {
+- "Repository":"ubuntu",
+- "Tag":"precise",
++ "Repository":"base",
++ "Tag":"ubuntu-12.10",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+ "VirtualSize":180116135
+ },
+ {
+- "Repository":"ubuntu",
+- "Tag":"12.04",
++ "Repository":"base",
++ "Tag":"ubuntu-quantal",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+@@ -635,9 +635,9 @@
+ "d6434d954665" -> "d82cbacda43a"
+ base -> "e9aa60c60128" [style=invis]
+ "074be284591f" -> "f71189fff3de"
+- "b750fe79269d" [label="b750fe79269d\nubuntu",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "e9aa60c60128" [label="e9aa60c60128\ncentos",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "9a33b36209ed" [label="9a33b36209ed\nfedora",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "b750fe79269d" [label="b750fe79269d\nbase",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "e9aa60c60128" [label="e9aa60c60128\nbase2",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "9a33b36209ed" [label="9a33b36209ed\ntest",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+ base [style=invisible]
+ }
+
+@@ -658,7 +658,7 @@
+
+ .. sourcecode:: http
+
+- POST /images/create?fromImage=ubuntu HTTP/1.1
++ POST /images/create?fromImage=base HTTP/1.1
+
+ **Example response**:
+
+@@ -721,7 +721,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/centos/json HTTP/1.1
++ GET /images/base/json HTTP/1.1
+
+ **Example response**:
+
+@@ -751,7 +751,7 @@
+ "Env":null,
+ "Cmd": ["/bin/bash"]
+ ,"Dns":null,
+- "Image":"centos",
++ "Image":"base",
+ "Volumes":null,
+ "VolumesFrom":"",
+ "WorkingDir":""
+@@ -776,7 +776,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/fedora/history HTTP/1.1
++ GET /images/base/history HTTP/1.1
+
+ **Example response**:
+
+@@ -1126,10 +1126,10 @@
+ HTTP/1.1 200 OK
+ Content-Type: application/json
+
+- {"status":"create","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067924}
+- {"status":"start","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067924}
+- {"status":"stop","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067966}
+- {"status":"destroy","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067970}
++ {"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
++ {"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
++ {"status":"stop","id":"dfdf82bd3881","from":"base:latest","time":1374067966}
++ {"status":"destroy","id":"dfdf82bd3881","from":"base:latest","time":1374067970}
+
+ :query since: timestamp used for polling
+ :statuscode 200: no error
+diff -uNr docker-0.6.3/docs/sources/api/docker_remote_api_v1.5.rst docker/docs/sources/api/docker_remote_api_v1.5.rst
+--- docker-0.6.3/docs/sources/api/docker_remote_api_v1.5.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/docker_remote_api_v1.5.rst 2013-09-26 14:37:16.144935718 -0500
+@@ -46,7 +46,7 @@
+ [
+ {
+ "Id": "8dfafdbc3a40",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 1",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -56,7 +56,7 @@
+ },
+ {
+ "Id": "9cd87474be90",
+- "Image": "ubuntu:latest",
++ "Image": "base:latest",
+ "Command": "echo 222222",
+ "Created": 1367854155,
+ "Status": "Exit 0",
+@@ -66,7 +66,7 @@
+ },
+ {
+ "Id": "3176a2479c92",
+- "Image": "centos:latest",
++ "Image": "base:latest",
+ "Command": "echo 3333333333333333",
+ "Created": 1367854154,
+ "Status": "Exit 0",
+@@ -76,7 +76,7 @@
+ },
+ {
+ "Id": "4cb07b47f9fb",
+- "Image": "fedora:latest",
++ "Image": "base:latest",
+ "Command": "echo 444444444444444444444444444444444",
+ "Created": 1367854152,
+ "Status": "Exit 0",
+@@ -128,7 +128,7 @@
+ "date"
+ ],
+ "Dns":null,
+- "Image":"ubuntu",
++ "Image":"base",
+ "Volumes":{},
+ "VolumesFrom":"",
+ "WorkingDir":""
+@@ -196,7 +196,7 @@
+ "date"
+ ],
+ "Dns": null,
+- "Image": "ubuntu",
++ "Image": "base",
+ "Volumes": {},
+ "VolumesFrom": "",
+ "WorkingDir":""
@@ -358,7 +358,7 @@
{
@@ -2845,6 +4077,76 @@ diff -uNr docker-0.6.2/docs/sources/api/docker_remote_api_v1.5.rst docker-devmap
}
**Example response**:
+@@ -591,16 +591,16 @@
+
+ [
+ {
+- "Repository":"ubuntu",
+- "Tag":"precise",
++ "Repository":"base",
++ "Tag":"ubuntu-12.10",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+ "VirtualSize":180116135
+ },
+ {
+- "Repository":"ubuntu",
+- "Tag":"12.04",
++ "Repository":"base",
++ "Tag":"ubuntu-quantal",
+ "Id":"b750fe79269d",
+ "Created":1364102658,
+ "Size":24653,
+@@ -634,9 +634,9 @@
+ "d6434d954665" -> "d82cbacda43a"
+ base -> "e9aa60c60128" [style=invis]
+ "074be284591f" -> "f71189fff3de"
+- "b750fe79269d" [label="b750fe79269d\nubuntu",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "e9aa60c60128" [label="e9aa60c60128\ncentos",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+- "9a33b36209ed" [label="9a33b36209ed\nfedora",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "b750fe79269d" [label="b750fe79269d\nbase",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "e9aa60c60128" [label="e9aa60c60128\nbase2",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
++ "9a33b36209ed" [label="9a33b36209ed\ntest",shape=box,fillcolor="paleturquoise",style="filled,rounded"];
+ base [style=invisible]
+ }
+
+@@ -657,7 +657,7 @@
+
+ .. sourcecode:: http
+
+- POST /images/create?fromImage=ubuntu HTTP/1.1
++ POST /images/create?fromImage=base HTTP/1.1
+
+ **Example response**:
+
+@@ -724,7 +724,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/centos/json HTTP/1.1
++ GET /images/base/json HTTP/1.1
+
+ **Example response**:
+
+@@ -754,7 +754,7 @@
+ "Env":null,
+ "Cmd": ["/bin/bash"]
+ ,"Dns":null,
+- "Image":"centos",
++ "Image":"base",
+ "Volumes":null,
+ "VolumesFrom":"",
+ "WorkingDir":""
+@@ -778,7 +778,7 @@
+
+ .. sourcecode:: http
+
+- GET /images/fedora/history HTTP/1.1
++ GET /images/base/history HTTP/1.1
+
+ **Example response**:
+
@@ -976,7 +976,6 @@
:query t: repository name (and optionally a tag) to be applied to the resulting image in case of success
:query q: suppress verbose build output
@@ -2853,9 +4155,42 @@ diff -uNr docker-0.6.2/docs/sources/api/docker_remote_api_v1.5.rst docker-devmap
:statuscode 200: no error
:statuscode 500: server error
-diff -uNr docker-0.6.2/docs/sources/commandline/command/build.rst docker-devmapper/docs/sources/commandline/command/build.rst
---- docker-0.6.2/docs/sources/commandline/command/build.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/commandline/command/build.rst 2013-09-23 10:37:38.988306093 -0500
+@@ -1131,10 +1130,10 @@
+ HTTP/1.1 200 OK
+ Content-Type: application/json
+
+- {"status":"create","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067924}
+- {"status":"start","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067924}
+- {"status":"stop","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067966}
+- {"status":"destroy","id":"dfdf82bd3881","from":"ubuntu:latest","time":1374067970}
++ {"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
++ {"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
++ {"status":"stop","id":"dfdf82bd3881","from":"base:latest","time":1374067966}
++ {"status":"destroy","id":"dfdf82bd3881","from":"base:latest","time":1374067970}
+
+ :query since: timestamp used for polling
+ :statuscode 200: no error
+diff -uNr docker-0.6.3/docs/sources/api/index_api.rst docker/docs/sources/api/index_api.rst
+--- docker-0.6.3/docs/sources/api/index_api.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/api/index_api.rst 2013-09-26 14:37:02.935991299 -0500
+@@ -541,11 +541,10 @@
+ Content-Type: application/json
+
+ {"query":"search_term",
+- "num_results": 3,
++ "num_results": 2,
+ "results" : [
+- {"name": "ubuntu", "description": "An ubuntu image..."},
+- {"name": "centos", "description": "A centos image..."},
+- {"name": "fedora", "description": "A fedora image..."}
++ {"name": "dotcloud/base", "description": "A base ubuntu64 image..."},
++ {"name": "base2", "description": "A base ubuntu64 image..."},
+ ]
+ }
+
+diff -uNr docker-0.6.3/docs/sources/commandline/command/build.rst docker/docs/sources/commandline/command/build.rst
+--- docker-0.6.3/docs/sources/commandline/command/build.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/commandline/command/build.rst 2013-09-26 14:37:02.936991295 -0500
@@ -13,7 +13,6 @@
-t="": Repository name (and optionally a tag) to be applied to the resulting image in case of success.
-q=false: Suppress verbose build output.
@@ -2864,9 +4199,9 @@ diff -uNr docker-0.6.2/docs/sources/commandline/command/build.rst docker-devmapp
When a single Dockerfile is given as URL, then no context is set. When a git repository is set as URL, the repository is used as context
-diff -uNr docker-0.6.2/docs/sources/commandline/command/commit.rst docker-devmapper/docs/sources/commandline/command/commit.rst
---- docker-0.6.2/docs/sources/commandline/command/commit.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/commandline/command/commit.rst 2013-09-23 10:37:38.984306104 -0500
+diff -uNr docker-0.6.3/docs/sources/commandline/command/commit.rst docker/docs/sources/commandline/command/commit.rst
+--- docker-0.6.3/docs/sources/commandline/command/commit.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/commandline/command/commit.rst 2013-09-26 14:37:02.936991295 -0500
@@ -19,31 +19,15 @@
Full -run example::
@@ -2911,9 +4246,161 @@ diff -uNr docker-0.6.2/docs/sources/commandline/command/commit.rst docker-devmap
+ "Env": ["FOO=BAR", "FOO2=BAR2"],
+ "Cmd": ["cat", "-e", "/etc/resolv.conf"],
+ "Dns": ["8.8.8.8", "8.8.4.4"]}
-diff -uNr docker-0.6.2/docs/sources/examples/hello_world_daemon.rst docker-devmapper/docs/sources/examples/hello_world_daemon.rst
---- docker-0.6.2/docs/sources/examples/hello_world_daemon.rst 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/docs/sources/examples/hello_world_daemon.rst 2013-09-23 10:37:38.841306502 -0500
+diff -uNr docker-0.6.3/docs/sources/contributing/devenvironment.rst docker/docs/sources/contributing/devenvironment.rst
+--- docker-0.6.3/docs/sources/contributing/devenvironment.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/contributing/devenvironment.rst 2013-09-26 14:37:02.941991275 -0500
+@@ -3,7 +3,7 @@
+ :keywords: Docker, documentation, developers, contributing, dev environment
+
+ Setting Up a Dev Environment
+-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++============================
+
+ To make it easier to contribute to Docker, we provide a standard
+ development environment. It is important that the same environment be
+@@ -12,11 +12,11 @@
+ binaries, go environment, go dependencies, etc.
+
+
+-Step 1: Install Docker
++Step 1: install docker
+ ----------------------
+
+ Docker's build environment itself is a Docker container, so the first
+-step is to install Docker on your system.
++step is to install docker on your system.
+
+ You can follow the `install instructions most relevant to your system
+ <https://docs.docker.io/en/latest/installation/>`_. Make sure you have
+@@ -24,109 +24,40 @@
+ step.
+
+
+-Step 2: Check out the Source
++Step 2: check out the source
+ ----------------------------
+
+-.. code-block:: bash
++::
+
+ git clone http://git@github.com/dotcloud/docker
+ cd docker
+
+-To checkout a different revision just use ``git checkout`` with the name of branch or revision number.
+
++Step 3: build
++-------------
+
+-Step 3: Build the Environment
+------------------------------
++When you are ready to build docker, run this command:
+
+-This following command will build a development environment using the Dockerfile in the current directory. Essentially, it will install all the build and runtime dependencies necessary to build and test Docker. This command will take some time to complete when you first execute it.
+-
+-.. code-block:: bash
++::
+
+ sudo docker build -t docker .
+
++This will build the revision currently checked out in the
++repository. Feel free to check out the version of your choice.
+
++If the build is successful, congratulations! You have produced a clean
++build of docker, neatly encapsulated in a standard build environment.
+
+-If the build is successful, congratulations! You have produced a clean build of docker, neatly encapsulated in a standard build environment.
+-
+-
+-Step 4: Build the Docker Binary
+--------------------------------
+-
+-To create the Docker binary, run this command:
+-
+-.. code-block:: bash
+-
+- sudo docker run -lxc-conf=lxc.aa_profile=unconfined -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary
+-
+-This will create the Docker binary in ``./bundles/<version>-dev/binary/``
+-
+-
+-Step 5: Run the Tests
+----------------------
+-
+-To run the Docker test cases you first need to disable `AppArmor <https://wiki.ubuntu.com/AppArmor>`_ using the following commands
+-
+-.. code-block:: bash
+-
+- sudo /etc/init.d/apparmor stop
+- sudo /etc/init.d/apparmor teardown
+-
+-To execute the test cases, run this command:
+-
+-.. code-block:: bash
+-
+- sudo docker run -lxc-conf=lxc.aa_profile=unconfined -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test
+-
+-
+-If the test are successful then the tail of the output should look something like this
+-
+-.. code-block:: bash
+-
+- --- PASS: TestWriteBroadcaster (0.00 seconds)
+- === RUN TestRaceWriteBroadcaster
+- --- PASS: TestRaceWriteBroadcaster (0.00 seconds)
+- === RUN TestTruncIndex
+- --- PASS: TestTruncIndex (0.00 seconds)
+- === RUN TestCompareKernelVersion
+- --- PASS: TestCompareKernelVersion (0.00 seconds)
+- === RUN TestHumanSize
+- --- PASS: TestHumanSize (0.00 seconds)
+- === RUN TestParseHost
+- --- PASS: TestParseHost (0.00 seconds)
+- === RUN TestParseRepositoryTag
+- --- PASS: TestParseRepositoryTag (0.00 seconds)
+- === RUN TestGetResolvConf
+- --- PASS: TestGetResolvConf (0.00 seconds)
+- === RUN TestCheckLocalDns
+- --- PASS: TestCheckLocalDns (0.00 seconds)
+- === RUN TestParseRelease
+- --- PASS: TestParseRelease (0.00 seconds)
+- === RUN TestDependencyGraphCircular
+- --- PASS: TestDependencyGraphCircular (0.00 seconds)
+- === RUN TestDependencyGraph
+- --- PASS: TestDependencyGraph (0.00 seconds)
+- PASS
+- ok github.com/dotcloud/docker/utils 0.017s
+-
+-
+-
+-
+-Step 6: Use Docker
+--------------------
+-
+-You can run an interactive session in the newly built container:
+-
+-.. code-block:: bash
+-
+- sudo docker run -privileged -i -t docker bash
++You can run an interactive session in the newly built container:
+
+- # type 'exit' to exit
++::
+
++ sudo docker run -i -t docker bash
+
+
+-.. note:: The binary is availalbe outside the container in the directory ``./bundles/<version>-dev/binary/``.
++To extract the binaries from the container:
+
++::
+
+-**Need More Help?**
++ sudo docker run docker sh -c 'cat $(which docker)' > docker-build && chmod +x docker-build
+
+-If you need more help then hop on to the `#docker-dev IRC channel <irc://chat.freenode.net#docker-dev>`_ or post a message on the `Docker developer mailinglist <https://groups.google.com/d/forum/docker-dev>`_.
+diff -uNr docker-0.6.3/docs/sources/examples/hello_world_daemon.rst docker/docs/sources/examples/hello_world_daemon.rst
+--- docker-0.6.3/docs/sources/examples/hello_world_daemon.rst 1969-12-31 18:00:00.000000000 -0600
++++ docker/docs/sources/examples/hello_world_daemon.rst 2013-09-26 14:37:16.146935711 -0500
@@ -0,0 +1,95 @@
+:title: Hello world daemon example
+:description: A simple hello world daemon example with Docker
@@ -3010,9 +4497,9 @@ diff -uNr docker-0.6.2/docs/sources/examples/hello_world_daemon.rst docker-devma
+ </div>
+
+Continue to the :ref:`python_web_app` example.
-diff -uNr docker-0.6.2/docs/sources/examples/hello_world.rst docker-devmapper/docs/sources/examples/hello_world.rst
---- docker-0.6.2/docs/sources/examples/hello_world.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/examples/hello_world.rst 2013-09-23 10:37:38.854306466 -0500
+diff -uNr docker-0.6.3/docs/sources/examples/hello_world.rst docker/docs/sources/examples/hello_world.rst
+--- docker-0.6.3/docs/sources/examples/hello_world.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/examples/hello_world.rst 2013-09-26 14:37:02.941991275 -0500
@@ -2,28 +2,6 @@
:description: A simple hello world example with Docker
:keywords: docker, example, hello world
@@ -3152,12 +4639,15 @@ diff -uNr docker-0.6.2/docs/sources/examples/hello_world.rst docker-devmapper/do
- postgresql_service
- mongodb
+Continue to the :ref:`hello_world_daemon` example.
-diff -uNr docker-0.6.2/docs/sources/examples/index.rst docker-devmapper/docs/sources/examples/index.rst
---- docker-0.6.2/docs/sources/examples/index.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/examples/index.rst 2013-09-23 10:37:38.849306480 -0500
-@@ -5,16 +5,16 @@
+diff -uNr docker-0.6.3/docs/sources/examples/index.rst docker/docs/sources/examples/index.rst
+--- docker-0.6.3/docs/sources/examples/index.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/examples/index.rst 2013-09-26 14:37:16.146935711 -0500
+@@ -3,19 +3,18 @@
+ :keywords: docker, hello world, node, nodejs, python, couch, couchdb, redis, ssh, sshd, examples, postgresql
+-.. _example_list:
+
Examples
-========
+============
@@ -3176,9 +4666,9 @@ diff -uNr docker-0.6.2/docs/sources/examples/index.rst docker-devmapper/docs/sou
python_web_app
nodejs_web_app
running_redis_service
-diff -uNr docker-0.6.2/docs/sources/examples/running_examples.rst docker-devmapper/docs/sources/examples/running_examples.rst
---- docker-0.6.2/docs/sources/examples/running_examples.rst 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/docs/sources/examples/running_examples.rst 2013-09-23 10:37:38.857306457 -0500
+diff -uNr docker-0.6.3/docs/sources/examples/running_examples.rst docker/docs/sources/examples/running_examples.rst
+--- docker-0.6.3/docs/sources/examples/running_examples.rst 1969-12-31 18:00:00.000000000 -0600
++++ docker/docs/sources/examples/running_examples.rst 2013-09-26 14:37:02.942991270 -0500
@@ -0,0 +1,23 @@
+:title: Running the Examples
+:description: An overview on how to run the docker examples
@@ -3203,9 +4693,21 @@ diff -uNr docker-0.6.2/docs/sources/examples/running_examples.rst docker-devmapp
+ .. code-block:: bash
+
+ sudo docker help
-diff -uNr docker-0.6.2/docs/sources/faq.rst docker-devmapper/docs/sources/faq.rst
---- docker-0.6.2/docs/sources/faq.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/faq.rst 2013-09-23 10:37:38.998306065 -0500
+diff -uNr docker-0.6.3/docs/sources/examples/running_ssh_service.rst docker/docs/sources/examples/running_ssh_service.rst
+--- docker-0.6.3/docs/sources/examples/running_ssh_service.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/examples/running_ssh_service.rst 2013-09-26 14:37:02.943991266 -0500
+@@ -47,7 +47,7 @@
+ # I had it so it was quick
+ # now let's connect using -i for interactive and with -t for terminal
+ # we execute /bin/bash to get a prompt.
+- $ docker run -i -t ubuntu /bin/bash
++ $ docker run -i -t base /bin/bash
+ # yes! we are in!
+ # now lets install openssh
+ $ apt-get update
+diff -uNr docker-0.6.3/docs/sources/faq.rst docker/docs/sources/faq.rst
+--- docker-0.6.3/docs/sources/faq.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/faq.rst 2013-09-26 14:37:02.943991266 -0500
@@ -122,13 +122,6 @@
(Jenkins, Strider, Travis), etc. Docker is rapidly establishing
itself as the standard for container-based tooling.
@@ -3220,9 +4722,9 @@ diff -uNr docker-0.6.2/docs/sources/faq.rst docker-devmapper/docs/sources/faq.rs
Can I help by adding some questions and answers?
................................................
-diff -uNr docker-0.6.2/docs/sources/installation/amazon.rst docker-devmapper/docs/sources/installation/amazon.rst
---- docker-0.6.2/docs/sources/installation/amazon.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/installation/amazon.rst 2013-09-23 10:37:39.065305879 -0500
+diff -uNr docker-0.6.3/docs/sources/installation/amazon.rst docker/docs/sources/installation/amazon.rst
+--- docker-0.6.3/docs/sources/installation/amazon.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/installation/amazon.rst 2013-09-26 14:37:16.147935707 -0500
@@ -1,77 +1,24 @@
:title: Installation on Amazon EC2
-:description: Docker installation on Amazon EC2
@@ -3363,9 +4865,47 @@ diff -uNr docker-0.6.2/docs/sources/installation/amazon.rst docker-devmapper/doc
7. Connect to your machine
-diff -uNr docker-0.6.2/docs/sources/installation/kernel.rst docker-devmapper/docs/sources/installation/kernel.rst
---- docker-0.6.2/docs/sources/installation/kernel.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/installation/kernel.rst 2013-09-23 10:37:39.011306029 -0500
+diff -uNr docker-0.6.3/docs/sources/installation/gentoolinux.rst docker/docs/sources/installation/gentoolinux.rst
+--- docker-0.6.3/docs/sources/installation/gentoolinux.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/installation/gentoolinux.rst 2013-09-26 14:37:16.148935702 -0500
+@@ -25,11 +25,15 @@
+
+ sudo emerge -av app-portage/layman
+
+-Add the "docker" overlay using layman:
++Using your favorite editor, add
++``https://raw.github.com/tianon/docker-overlay/master/repositories.xml`` to the
++``overlays`` section in ``/etc/layman/layman.cfg`` (as per instructions on the
++`Gentoo Wiki <http://wiki.gentoo.org/wiki/Layman#Adding_custom_overlays>`_),
++then invoke the following:
+
+ .. code-block:: bash
+
+- sudo layman -a docker
++ sudo layman -f -a docker
+
+ Once that completes, the ``app-emulation/docker`` package will be available
+ for emerge:
+@@ -40,7 +44,7 @@
+
+ If you prefer to use the official binaries, or just do not wish to compile
+ docker, emerge ``app-emulation/docker-bin`` instead. It is important to
+-remember that Gentoo is still an unofficial platform, even when using the
++remember that Gentoo is still an unsupported platform, even when using the
+ official binaries.
+
+ The package should already include all the necessary dependencies. For the
+@@ -119,7 +123,3 @@
+ fresh start of docker, the first docker run fails due to some tricky terminal
+ issues, so be sure to run something trivial (such as ``docker run -i -t busybox
+ echo hi``) before attempting to run anything important.
+-
+-There is a tentative (and very hacky) workaround for this in the OpenRC init
+-script, and it can be enabled by modifying the appropriate value in
+-``/etc/conf.d/docker`` after successful installation.
+diff -uNr docker-0.6.3/docs/sources/installation/kernel.rst docker/docs/sources/installation/kernel.rst
+--- docker-0.6.3/docs/sources/installation/kernel.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/installation/kernel.rst 2013-09-26 14:37:02.952991228 -0500
@@ -62,7 +62,7 @@
Cgroups and namespaces
----------------------
@@ -3375,9 +4915,9 @@ diff -uNr docker-0.6.2/docs/sources/installation/kernel.rst docker-devmapper/doc
to run LXC containers. Technically, while namespaces have been introduced
in the early 2.6 kernels, we do not advise to try any kernel before 2.6.32
to run LXC containers. Note that 2.6.32 has some documented issues regarding
-diff -uNr docker-0.6.2/docs/sources/installation/ubuntulinux.rst docker-devmapper/docs/sources/installation/ubuntulinux.rst
---- docker-0.6.2/docs/sources/installation/ubuntulinux.rst 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/installation/ubuntulinux.rst 2013-09-23 10:37:39.068305871 -0500
+diff -uNr docker-0.6.3/docs/sources/installation/ubuntulinux.rst docker/docs/sources/installation/ubuntulinux.rst
+--- docker-0.6.3/docs/sources/installation/ubuntulinux.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/installation/ubuntulinux.rst 2013-09-26 14:37:16.148935702 -0500
@@ -78,7 +78,7 @@
sudo sh -c "curl https://get.docker.io/gpg | apt-key add -"
@@ -3387,8 +4927,12 @@ diff -uNr docker-0.6.2/docs/sources/installation/ubuntulinux.rst docker-devmappe
# Update your sources
sudo apt-get update
-@@ -132,7 +132,7 @@
- sudo sh -c "curl http://get.docker.io/gpg | apt-key add -"
+@@ -129,10 +129,10 @@
+
+ # Add the Docker repository key to your local keychain
+ # using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
+- sudo sh -c "curl https://get.docker.io/gpg | apt-key add -"
++ sudo sh -c "curl http://get.docker.io/gpg | apt-key add -"
# Add the Docker repository to your apt sources list.
- sudo sh -c "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
@@ -3396,15 +4940,15 @@ diff -uNr docker-0.6.2/docs/sources/installation/ubuntulinux.rst docker-devmappe
# update
sudo apt-get update
-Binary files docker-0.6.2/docs/sources/terms/images/docker-filesystems-busyboxrw.png and docker-devmapper/docs/sources/terms/images/docker-filesystems-busyboxrw.png differ
-Binary files docker-0.6.2/docs/sources/terms/images/docker-filesystems-debian.png and docker-devmapper/docs/sources/terms/images/docker-filesystems-debian.png differ
-Binary files docker-0.6.2/docs/sources/terms/images/docker-filesystems-debianrw.png and docker-devmapper/docs/sources/terms/images/docker-filesystems-debianrw.png differ
-Binary files docker-0.6.2/docs/sources/terms/images/docker-filesystems-generic.png and docker-devmapper/docs/sources/terms/images/docker-filesystems-generic.png differ
-Binary files docker-0.6.2/docs/sources/terms/images/docker-filesystems-multilayer.png and docker-devmapper/docs/sources/terms/images/docker-filesystems-multilayer.png differ
-Binary files docker-0.6.2/docs/sources/terms/images/docker-filesystems-multiroot.png and docker-devmapper/docs/sources/terms/images/docker-filesystems-multiroot.png differ
-diff -uNr docker-0.6.2/docs/sources/terms/images/docker-filesystems.svg docker-devmapper/docs/sources/terms/images/docker-filesystems.svg
---- docker-0.6.2/docs/sources/terms/images/docker-filesystems.svg 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/sources/terms/images/docker-filesystems.svg 2013-09-23 10:37:38.907306318 -0500
+Binary files docker-0.6.3/docs/sources/terms/images/docker-filesystems-busyboxrw.png and docker/docs/sources/terms/images/docker-filesystems-busyboxrw.png differ
+Binary files docker-0.6.3/docs/sources/terms/images/docker-filesystems-debian.png and docker/docs/sources/terms/images/docker-filesystems-debian.png differ
+Binary files docker-0.6.3/docs/sources/terms/images/docker-filesystems-debianrw.png and docker/docs/sources/terms/images/docker-filesystems-debianrw.png differ
+Binary files docker-0.6.3/docs/sources/terms/images/docker-filesystems-generic.png and docker/docs/sources/terms/images/docker-filesystems-generic.png differ
+Binary files docker-0.6.3/docs/sources/terms/images/docker-filesystems-multilayer.png and docker/docs/sources/terms/images/docker-filesystems-multilayer.png differ
+Binary files docker-0.6.3/docs/sources/terms/images/docker-filesystems-multiroot.png and docker/docs/sources/terms/images/docker-filesystems-multiroot.png differ
+diff -uNr docker-0.6.3/docs/sources/terms/images/docker-filesystems.svg docker/docs/sources/terms/images/docker-filesystems.svg
+--- docker-0.6.3/docs/sources/terms/images/docker-filesystems.svg 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/terms/images/docker-filesystems.svg 2013-09-26 14:37:02.965991174 -0500
@@ -26,16 +26,16 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
@@ -5746,9 +7290,152 @@ diff -uNr docker-0.6.2/docs/sources/terms/images/docker-filesystems.svg docker-d
</g>
</g>
</svg>
-diff -uNr docker-0.6.2/docs/theme/docker/layout.html docker-devmapper/docs/theme/docker/layout.html
---- docker-0.6.2/docs/theme/docker/layout.html 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/docs/theme/docker/layout.html 2013-09-23 10:37:38.736306794 -0500
+diff -uNr docker-0.6.3/docs/sources/use/baseimages.rst docker/docs/sources/use/baseimages.rst
+--- docker-0.6.3/docs/sources/use/baseimages.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/use/baseimages.rst 2013-09-26 14:37:02.966991170 -0500
+@@ -37,5 +37,7 @@
+ Docker Github Repo:
+
+ * `BusyBox <https://github.com/dotcloud/docker/blob/master/contrib/mkimage-busybox.sh>`_
++* `CentOS
++ <https://github.com/dotcloud/docker/blob/master/contrib/mkimage-centos.sh>`_
+ * `Debian
+ <https://github.com/dotcloud/docker/blob/master/contrib/mkimage-debian.sh>`_
+diff -uNr docker-0.6.3/docs/sources/use/workingwithrepository.rst docker/docs/sources/use/workingwithrepository.rst
+--- docker-0.6.3/docs/sources/use/workingwithrepository.rst 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/sources/use/workingwithrepository.rst 2013-09-26 14:37:02.967991166 -0500
+@@ -52,58 +52,31 @@
+ * User images are not checked, it is therefore up to you whether or
+ not you trust the creator of this image.
+
+-.. _searching_central_index:
++Find public images available on the Central Index
++-------------------------------------------------
+
+-Find Public Images on the Central Index
+----------------------------------------
++Search by name, namespace or description
++
++.. code-block:: bash
++
++ sudo docker search <value>
+
+-You can search the Central Index `online <https://index.docker.io>`_
+-or by the CLI. Searching can find images by name, user name or
+-description:
++
++Download them simply by their name
+
+ .. code-block:: bash
+
+- $ sudo docker help search
+- Usage: docker search NAME
++ sudo docker pull <value>
+
+- Search the docker index for images
+
+- -notrunc=false: Don't truncate output
+- $ sudo docker search centos
+- Found 25 results matching your query ("centos")
+- NAME DESCRIPTION
+- centos
+- slantview/centos-chef-solo CentOS 6.4 with chef-solo.
+- ...
+-
+-There you can see two example results: ``centos`` and
+-``slantview/centos-chef-solo``. The second result shows that it comes
+-from the public repository of a user, ``slantview/``, while the first
+-result (``centos``) doesn't explicitly list a repository so it comes
+-from the trusted Central Repository. The ``/`` character separates a
+-user's repository and the image name.
++Very similarly you can search for and browse the index online on
++https://index.docker.io
+
+-Once you have found the image name, you can download it:
+
+-.. code-block:: bash
++Connecting to the Central Registry
++----------------------------------
+
+- # sudo docker pull <value>
+- $ sudo docker pull centos
+- Pulling repository centos
+- 539c0211cd76: Download complete
+-
+-What can you do with that image? Check out the :ref:`example_list`
+-and, when you're ready with your own image, come back here to learn
+-how to share it.
+-
+-Contributing to the Central Registry
+-------------------------------------
+-
+-Anyone can pull public images from the Central Registry, but if you
+-would like to share one of your own images, then you must register a
+-unique user name first. You can create your username and login on the
+-`central Docker Index online
+-<https://index.docker.io/account/signup/>`_, or by running
++You can create a user on the central Docker Index online, or by running
+
+ .. code-block:: bash
+
+@@ -112,27 +85,22 @@
+ This will prompt you for a username, which will become a public
+ namespace for your public repositories.
+
+-If your username is available then ``docker`` will also prompt you to
+-enter a password and your e-mail address. It will then automatically
+-log you in. Now you're ready to commit and push your own images!
++If your username does not exist it will prompt you to also enter a
++password and your e-mail address. It will then automatically log you
++in.
+
+ .. _container_commit:
+
+-Committing a Container to a Named Image
++Committing a container to a named image
+ ---------------------------------------
+
+-When you make changes to an existing image, those changes get saved to
+-a container's file system. You can then promote that container to
+-become an image by making a ``commit``. In addition to converting the
+-container to an image, this is also your opportunity to name the
+-image, specifically a name that includes your user name from the
+-Central Docker Index (as you did a ``login`` above) and a meaningful
+-name for the image.
++In order to commit to the repository it is required to have committed
++your container to an image within your username namespace.
+
+ .. code-block:: bash
+
+- # format is "sudo docker commit <container_id> <username>/<imagename>"
+- $ sudo docker commit $CONTAINER_ID myname/kickassapp
++ # for example docker commit $CONTAINER_ID dhrp/kickassapp
++ sudo docker commit <container_id> <username>/<repo_name>
+
+ .. _image_push:
+
+@@ -147,15 +115,15 @@
+
+ .. code-block:: bash
+
+- # format is "docker push <username>/<repo_name>"
+- $ sudo docker push myname/kickassapp
++ # for example docker push dhrp/kickassapp
++ sudo docker push <username>/<repo_name>
+
+ .. _using_private_repositories:
+
+ Private Repositories
+ --------------------
+
+-Right now (version 0.6), private repositories are only possible by
++Right now (version 0.5), private repositories are only possible by
+ hosting `your own registry
+ <https://github.com/dotcloud/docker-registry>`_. To push or pull to a
+ repository on your own registry, you must prefix the tag with the
+diff -uNr docker-0.6.3/docs/theme/docker/layout.html docker/docs/theme/docker/layout.html
+--- docker-0.6.3/docs/theme/docker/layout.html 2013-09-23 13:29:11.000000000 -0500
++++ docker/docs/theme/docker/layout.html 2013-09-26 14:37:16.150935693 -0500
@@ -6,7 +6,6 @@
<head>
<meta charset="utf-8">
@@ -5768,17 +7455,27 @@ diff -uNr docker-0.6.2/docs/theme/docker/layout.html docker-devmapper/docs/theme
</div>
<!-- body block -->
-diff -uNr docker-0.6.2/FIXME docker-devmapper/FIXME
---- docker-0.6.2/FIXME 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/FIXME 2013-09-23 10:37:38.639307063 -0500
+diff -uNr docker-0.6.3/FIXME docker/FIXME
+--- docker-0.6.3/FIXME 2013-09-23 13:29:11.000000000 -0500
++++ docker/FIXME 2013-09-26 14:37:02.921991358 -0500
@@ -34,4 +34,3 @@
* entry point config
* bring back git revision info, looks like it was lost
* Clean up the ProgressReader api, it's a PITA to use
-* Use netlink instead of iproute2/iptables (#925)
-diff -uNr docker-0.6.2/graph_test.go docker-devmapper/graph_test.go
---- docker-0.6.2/graph_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/graph_test.go 2013-09-23 10:37:38.652307027 -0500
+diff -uNr docker-0.6.3/.gitignore docker/.gitignore
+--- docker-0.6.3/.gitignore 2013-09-23 13:29:11.000000000 -0500
++++ docker/.gitignore 2013-09-26 14:37:02.919991367 -0500
+@@ -14,6 +14,3 @@
+ .gopath/
+ .dotcloud
+ *.test
+-bundles/
+-.hg/
+-.git/
+diff -uNr docker-0.6.3/graph_test.go docker/graph_test.go
+--- docker-0.6.3/graph_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/graph_test.go 2013-09-26 14:37:16.151935689 -0500
@@ -121,6 +121,9 @@
}
@@ -5804,9 +7501,9 @@ diff -uNr docker-0.6.2/graph_test.go docker-devmapper/graph_test.go
t.Error(err)
}
}()
-diff -uNr docker-0.6.2/hack/dind docker-devmapper/hack/dind
---- docker-0.6.2/hack/dind 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/dind 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/dind docker/hack/dind
+--- docker-0.6.3/hack/dind 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/dind 1969-12-31 18:00:00.000000000 -0600
@@ -1,59 +0,0 @@
-#!/bin/bash
-
@@ -5867,22 +7564,22 @@ diff -uNr docker-0.6.2/hack/dind docker-devmapper/hack/dind
-mount -t tmpfs none /tmp
-
-exec $*
-diff -uNr docker-0.6.2/hack/MAINTAINERS docker-devmapper/hack/MAINTAINERS
---- docker-0.6.2/hack/MAINTAINERS 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/MAINTAINERS 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/MAINTAINERS docker/hack/MAINTAINERS
+--- docker-0.6.3/hack/MAINTAINERS 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/MAINTAINERS 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Solomon Hykes <solomon at dotcloud.com> (@shykes)
-diff -uNr docker-0.6.2/hack/make/binary docker-devmapper/hack/make/binary
---- docker-0.6.2/hack/make/binary 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/make/binary 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/make/binary docker/hack/make/binary
+--- docker-0.6.3/hack/make/binary 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/make/binary 1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-
-DEST=$1
-
-go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS" ./docker
-diff -uNr docker-0.6.2/hack/make/README.md docker-devmapper/hack/make/README.md
---- docker-0.6.2/hack/make/README.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/make/README.md 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/make/README.md docker/hack/make/README.md
+--- docker-0.6.3/hack/make/README.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/make/README.md 1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-This directory holds scripts called by `make.sh` in the parent directory.
-
@@ -5901,9 +7598,9 @@ diff -uNr docker-0.6.2/hack/make/README.md docker-devmapper/hack/make/README.md
-
-* Create a shell-compatible file here
-* Add it to $DEFAULT_BUNDLES in make.sh
-diff -uNr docker-0.6.2/hack/make/test docker-devmapper/hack/make/test
---- docker-0.6.2/hack/make/test 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/make/test 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/make/test docker/hack/make/test
+--- docker-0.6.3/hack/make/test 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/make/test 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-DEST=$1
-
@@ -5932,10 +7629,10 @@ diff -uNr docker-0.6.2/hack/make/test docker-devmapper/hack/make/test
-}
-
-bundle_test
-diff -uNr docker-0.6.2/hack/make/ubuntu docker-devmapper/hack/make/ubuntu
---- docker-0.6.2/hack/make/ubuntu 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/make/ubuntu 1969-12-31 18:00:00.000000000 -0600
-@@ -1,94 +0,0 @@
+diff -uNr docker-0.6.3/hack/make/ubuntu docker/hack/make/ubuntu
+--- docker-0.6.3/hack/make/ubuntu 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/make/ubuntu 1969-12-31 18:00:00.000000000 -0600
+@@ -1,96 +0,0 @@
-#!/bin/sh
-
-DEST=$1
@@ -5989,11 +7686,13 @@ diff -uNr docker-0.6.2/hack/make/ubuntu docker-devmapper/hack/make/ubuntu
- cat >/tmp/postinstall <<EOF
-#!/bin/sh
-/sbin/stop docker || true
+-/bin/grep -q "^docker:" /etc/group || /usr/sbin/addgroup --system docker || true
-/sbin/start docker
-EOF
- cat >/tmp/prerm <<EOF
-#!/bin/sh
-/sbin/stop docker || true
+-/usr/sbin/delgroup docker || true
-EOF
- chmod +x /tmp/postinstall /tmp/prerm
-
@@ -6030,9 +7729,9 @@ diff -uNr docker-0.6.2/hack/make/ubuntu docker-devmapper/hack/make/ubuntu
-}
-
-bundle_ubuntu
-diff -uNr docker-0.6.2/hack/make.sh docker-devmapper/hack/make.sh
---- docker-0.6.2/hack/make.sh 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/make.sh 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/make.sh docker/hack/make.sh
+--- docker-0.6.3/hack/make.sh 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/make.sh 1969-12-31 18:00:00.000000000 -0600
@@ -1,91 +0,0 @@
-#!/bin/bash
-
@@ -6125,9 +7824,9 @@ diff -uNr docker-0.6.2/hack/make.sh docker-devmapper/hack/make.sh
-}
-
-main "$@"
-diff -uNr docker-0.6.2/hack/PACKAGERS.md docker-devmapper/hack/PACKAGERS.md
---- docker-0.6.2/hack/PACKAGERS.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/PACKAGERS.md 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/PACKAGERS.md docker/hack/PACKAGERS.md
+--- docker-0.6.3/hack/PACKAGERS.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/PACKAGERS.md 1969-12-31 18:00:00.000000000 -0600
@@ -1,137 +0,0 @@
-Dear packager.
-
@@ -6266,9 +7965,9 @@ diff -uNr docker-0.6.2/hack/PACKAGERS.md docker-devmapper/hack/PACKAGERS.md
-```
-docker -d
-```
-diff -uNr docker-0.6.2/hack/release/make.sh docker-devmapper/hack/release/make.sh
---- docker-0.6.2/hack/release/make.sh 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/hack/release/make.sh 2013-09-23 10:37:39.518304619 -0500
+diff -uNr docker-0.6.3/hack/release/make.sh docker/hack/release/make.sh
+--- docker-0.6.3/hack/release/make.sh 1969-12-31 18:00:00.000000000 -0600
++++ docker/hack/release/make.sh 2013-09-26 14:37:16.152935685 -0500
@@ -0,0 +1,179 @@
+#!/bin/sh
+
@@ -6449,9 +8148,9 @@ diff -uNr docker-0.6.2/hack/release/make.sh docker-devmapper/hack/release/make.s
+}
+
+main
-diff -uNr docker-0.6.2/hack/release/README.md docker-devmapper/hack/release/README.md
---- docker-0.6.2/hack/release/README.md 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/hack/release/README.md 2013-09-23 10:37:39.525304600 -0500
+diff -uNr docker-0.6.3/hack/release/README.md docker/hack/release/README.md
+--- docker-0.6.3/hack/release/README.md 1969-12-31 18:00:00.000000000 -0600
++++ docker/hack/release/README.md 2013-09-26 14:37:02.981991106 -0500
@@ -0,0 +1,106 @@
+## A maintainer's guide to releasing Docker
+
@@ -6559,9 +8258,9 @@ diff -uNr docker-0.6.2/hack/release/README.md docker-devmapper/hack/release/READ
+### 9. Rejoice!
+
+Congratulations! You're done.
-diff -uNr docker-0.6.2/hack/release/release.sh docker-devmapper/hack/release/release.sh
---- docker-0.6.2/hack/release/release.sh 1969-12-31 18:00:00.000000000 -0600
-+++ docker-devmapper/hack/release/release.sh 2013-09-23 10:37:39.527304594 -0500
+diff -uNr docker-0.6.3/hack/release/release.sh docker/hack/release/release.sh
+--- docker-0.6.3/hack/release/release.sh 1969-12-31 18:00:00.000000000 -0600
++++ docker/hack/release/release.sh 2013-09-26 14:37:02.981991106 -0500
@@ -0,0 +1,175 @@
+#!/bin/sh
+
@@ -6738,9 +8437,9 @@ diff -uNr docker-0.6.2/hack/release/release.sh docker-devmapper/hack/release/rel
+}
+
+main
-diff -uNr docker-0.6.2/hack/RELEASE-CHECKLIST.md docker-devmapper/hack/RELEASE-CHECKLIST.md
---- docker-0.6.2/hack/RELEASE-CHECKLIST.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/RELEASE-CHECKLIST.md 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/RELEASE-CHECKLIST.md docker/hack/RELEASE-CHECKLIST.md
+--- docker-0.6.3/hack/RELEASE-CHECKLIST.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/RELEASE-CHECKLIST.md 1969-12-31 18:00:00.000000000 -0600
@@ -1,106 +0,0 @@
-## A maintainer's guide to releasing Docker
-
@@ -6848,9 +8547,9 @@ diff -uNr docker-0.6.2/hack/RELEASE-CHECKLIST.md docker-devmapper/hack/RELEASE-C
-### 9. Rejoice!
-
-Congratulations! You're done.
-diff -uNr docker-0.6.2/hack/release.sh docker-devmapper/hack/release.sh
---- docker-0.6.2/hack/release.sh 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/release.sh 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/release.sh docker/hack/release.sh
+--- docker-0.6.3/hack/release.sh 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/release.sh 1969-12-31 18:00:00.000000000 -0600
@@ -1,182 +0,0 @@
-#!/bin/sh
-
@@ -7034,9 +8733,9 @@ diff -uNr docker-0.6.2/hack/release.sh docker-devmapper/hack/release.sh
-}
-
-main
-diff -uNr docker-0.6.2/hack/vendor.sh docker-devmapper/hack/vendor.sh
---- docker-0.6.2/hack/vendor.sh 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/hack/vendor.sh 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/hack/vendor.sh docker/hack/vendor.sh
+--- docker-0.6.3/hack/vendor.sh 2013-09-23 13:29:11.000000000 -0500
++++ docker/hack/vendor.sh 1969-12-31 18:00:00.000000000 -0600
@@ -1,41 +0,0 @@
-#!/bin/bash
-
@@ -7067,7 +8766,7 @@ diff -uNr docker-0.6.2/hack/vendor.sh docker-devmapper/hack/vendor.sh
-
-git_clone github.com/gorilla/mux/ 9b36453141c
-
--git_clone github.com/dotcloud/tar/ d06045a6d9
+-git_clone github.com/dotcloud/tar/ e5ea6bb21a
-
-# Docker requires code.google.com/p/go.net/websocket
-PKG=code.google.com/p/go.net REV=84a4013f96e0
@@ -7079,9 +8778,9 @@ diff -uNr docker-0.6.2/hack/vendor.sh docker-devmapper/hack/vendor.sh
- fi
- cd src/$PKG && hg checkout -r $REV
-)
-diff -uNr docker-0.6.2/image.go docker-devmapper/image.go
---- docker-0.6.2/image.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/image.go 2013-09-23 10:37:38.706306877 -0500
+diff -uNr docker-0.6.3/image.go docker/image.go
+--- docker-0.6.3/image.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/image.go 2013-09-26 14:37:16.152935685 -0500
@@ -15,6 +15,7 @@
"path/filepath"
"strconv"
@@ -7101,7 +8800,7 @@ diff -uNr docker-0.6.2/image.go docker-devmapper/image.go
func MountAUFS(ro []string, rw string, target string) error {
// FIXME: Now mount the layers
rwBranch := fmt.Sprintf("%v=rw", rw)
-@@ -170,37 +175,513 @@
+@@ -170,37 +175,518 @@
return Tar(layerPath, compression)
}
@@ -7110,6 +8809,7 @@ diff -uNr docker-0.6.2/image.go docker-devmapper/image.go
+type TimeUpdate struct {
+ path string
+ time []syscall.Timeval
++ mode uint32
+}
+
+func (image *Image) applyLayer(layer, target string) error {
@@ -7250,6 +8950,7 @@ diff -uNr docker-0.6.2/image.go docker-devmapper/image.go
+ u := TimeUpdate {
+ path: targetPath,
+ time: ts,
++ mode: srcStat.Mode,
+ }
+
+ // Delay time updates until all other changes done, or it is
@@ -7270,21 +8971,24 @@ diff -uNr docker-0.6.2/image.go docker-devmapper/image.go
+ update := updateTimes[i]
+
+ O_PATH := 010000000 // Not in syscall yet
-+ fd, err := syscall.Open(update.path, syscall.O_RDWR | O_PATH | syscall.O_NOFOLLOW, 0600)
-+ if err == syscall.EISDIR || err == syscall.ELOOP {
-+ // O_PATH not supported, use Utimes except on symlinks where Utimes doesn't work
-+ if err != syscall.ELOOP {
-+ err = syscall.Utimes(update.path, update.time)
-+ if err != nil {
-+ return err
-+ }
++ var err error = nil
++ if update.mode & syscall.S_IFLNK == syscall.S_IFLNK {
++ // Update time on the symlink via O_PATH + futimes(), if supported by the kernel
++
++ fd, err := syscall.Open(update.path, syscall.O_RDWR | O_PATH | syscall.O_NOFOLLOW, 0600)
++ if err == syscall.EISDIR || err == syscall.ELOOP {
++ // O_PATH not supported by kernel, nothing to do, ignore
++ } else if err != nil {
++ return err
++ } else {
++ syscall.Futimes(fd, update.time)
++ _ = syscall.Close(fd)
+ }
+ } else {
++ err = syscall.Utimes(update.path, update.time)
+ if err != nil {
+ return err
+ }
-+ syscall.Futimes(fd, update.time)
-+ _ = syscall.Close(fd)
+ }
+ }
+
@@ -7629,9 +9333,9 @@ diff -uNr docker-0.6.2/image.go docker-devmapper/image.go
func (image *Image) ShortID() string {
return utils.TruncateID(image.ID)
}
-diff -uNr docker-0.6.2/lxc_template.go docker-devmapper/lxc_template.go
---- docker-0.6.2/lxc_template.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/lxc_template.go 2013-09-23 10:37:39.544304547 -0500
+diff -uNr docker-0.6.3/lxc_template.go docker/lxc_template.go
+--- docker-0.6.3/lxc_template.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/lxc_template.go 2013-09-26 14:37:16.152935685 -0500
@@ -30,11 +30,9 @@
{{$ROOTFS := .RootfsPath}}
lxc.rootfs = {{$ROOTFS}}
@@ -7644,9 +9348,18 @@ diff -uNr docker-0.6.2/lxc_template.go docker-devmapper/lxc_template.go
# use a dedicated pts for the container (and limit the number of pseudo terminal
# available)
-diff -uNr docker-0.6.2/registry/registry.go docker-devmapper/registry/registry.go
---- docker-0.6.2/registry/registry.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/registry/registry.go 2013-09-23 10:37:39.222305442 -0500
+diff -uNr docker-0.6.3/registry/registry.go docker/registry/registry.go
+--- docker-0.6.3/registry/registry.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/registry/registry.go 2013-09-26 14:37:16.154935677 -0500
+@@ -70,7 +70,7 @@
+ if !validNamespace.MatchString(namespace) {
+ return fmt.Errorf("Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30", namespace)
+ }
+- validRepo := regexp.MustCompile(`^([a-z0-9-_.]+)$`)
++ validRepo := regexp.MustCompile(`^([a-zA-Z0-9-_.]+)$`)
+ if !validRepo.MatchString(name) {
+ return fmt.Errorf("Invalid repository name (%s), only [a-zA-Z0-9-_.] are allowed", name)
+ }
@@ -161,10 +161,10 @@
req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))
res, err := doWithCookies(r.client, req)
@@ -7661,9 +9374,40 @@ diff -uNr docker-0.6.2/registry/registry.go docker-devmapper/registry/registry.g
return nil, utils.NewHTTPRequestError(fmt.Sprintf("Internal server error: %d trying to fetch remote history for %s", res.StatusCode, imgID), res)
}
return nil, err
-diff -uNr docker-0.6.2/runtime.go docker-devmapper/runtime.go
---- docker-0.6.2/runtime.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/runtime.go 2013-09-23 10:37:39.262305331 -0500
+diff -uNr docker-0.6.3/registry/registry_test.go docker/registry/registry_test.go
+--- docker-0.6.3/registry/registry_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/registry/registry_test.go 2013-09-26 14:37:02.990991068 -0500
+@@ -159,11 +159,11 @@
+ func TestPushImageJSONIndex(t *testing.T) {
+ r := spawnTestRegistry(t)
+ imgData := []*ImgData{
+- {
++ &ImgData{
+ ID: "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
+ Checksum: "sha256:1ac330d56e05eef6d438586545ceff7550d3bdcb6b19961f12c5ba714ee1bb37",
+ },
+- {
++ &ImgData{
+ ID: "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d",
+ Checksum: "sha256:bea7bf2e4bacd479344b737328db47b18880d09096e6674165533aa994f5e9f2",
+ },
+@@ -196,13 +196,3 @@
+ }
+ assertEqual(t, results.NumResults, 0, "Expected 0 search results")
+ }
+-
+-func TestValidRepositoryName(t *testing.T) {
+- if err := validateRepositoryName("docker/docker"); err != nil {
+- t.Fatal(err)
+- }
+- if err := validateRepositoryName("docker/Docker"); err == nil {
+- t.Log("Repository name should be invalid")
+- t.Fail()
+- }
+-}
+diff -uNr docker-0.6.3/runtime.go docker/runtime.go
+--- docker-0.6.3/runtime.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/runtime.go 2013-09-26 14:37:16.154935677 -0500
@@ -10,12 +10,21 @@
"os"
"os/exec"
@@ -7824,9 +9568,9 @@ diff -uNr docker-0.6.2/runtime.go docker-devmapper/runtime.go
}
if err := runtime.restore(); err != nil {
-diff -uNr docker-0.6.2/runtime_test.go docker-devmapper/runtime_test.go
---- docker-0.6.2/runtime_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/runtime_test.go 2013-09-23 10:37:39.278305287 -0500
+diff -uNr docker-0.6.3/runtime_test.go docker/runtime_test.go
+--- docker-0.6.3/runtime_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/runtime_test.go 2013-09-26 14:37:16.154935677 -0500
@@ -4,7 +4,9 @@
"bytes"
"fmt"
@@ -7937,9 +9681,9 @@ diff -uNr docker-0.6.2/runtime_test.go docker-devmapper/runtime_test.go
if err != nil {
t.Fatal(err)
}
-diff -uNr docker-0.6.2/server.go docker-devmapper/server.go
---- docker-0.6.2/server.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/server.go 2013-09-23 10:37:39.261305334 -0500
+diff -uNr docker-0.6.3/server.go docker/server.go
+--- docker-0.6.3/server.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/server.go 2013-09-26 14:37:16.155935673 -0500
@@ -772,9 +772,7 @@
} else {
elem.Checksum = checksum
@@ -7983,9 +9727,9 @@ diff -uNr docker-0.6.2/server.go docker-devmapper/server.go
if err != nil {
return nil, err
}
-diff -uNr docker-0.6.2/utils/utils.go docker-devmapper/utils/utils.go
---- docker-0.6.2/utils/utils.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/utils/utils.go 2013-09-23 10:37:39.107305762 -0500
+diff -uNr docker-0.6.3/utils/utils.go docker/utils/utils.go
+--- docker-0.6.3/utils/utils.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/utils/utils.go 2013-09-26 14:37:16.158935659 -0500
@@ -1021,3 +1021,36 @@
func (e *StatusError) Error() string {
return fmt.Sprintf("Status: %d", e.Status)
@@ -8023,9 +9767,9 @@ diff -uNr docker-0.6.2/utils/utils.go docker-devmapper/utils/utils.go
+ }
+ return buf.String()
+}
-diff -uNr docker-0.6.2/utils/utils_test.go docker-devmapper/utils/utils_test.go
---- docker-0.6.2/utils/utils_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/utils/utils_test.go 2013-09-23 10:37:39.117305734 -0500
+diff -uNr docker-0.6.3/utils/utils_test.go docker/utils/utils_test.go
+--- docker-0.6.3/utils/utils_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/utils/utils_test.go 2013-09-26 14:37:16.158935659 -0500
@@ -366,6 +366,7 @@
assertParseRelease(t, "3.8.0-19-generic", &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "19-generic"}, 0)
}
@@ -8041,9 +9785,9 @@ diff -uNr docker-0.6.2/utils/utils_test.go docker-devmapper/utils/utils_test.go
-}
+}
\ No newline at end of file
-diff -uNr docker-0.6.2/utils.go docker-devmapper/utils.go
---- docker-0.6.2/utils.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/utils.go 2013-09-23 10:37:39.151305640 -0500
+diff -uNr docker-0.6.3/utils.go docker/utils.go
+--- docker-0.6.3/utils.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/utils.go 2013-09-26 14:37:16.157935664 -0500
@@ -1,8 +1,33 @@
package docker
@@ -8087,7 +9831,7 @@ diff -uNr docker-0.6.2/utils.go docker-devmapper/utils.go
+ if data, err := ioutil.ReadFile("/proc/self/mountinfo"); err == nil {
+ for _, line := range strings.Split(string(data), "\n") {
+ cols := strings.Split(line, " ")
-+ if len(cols) >= 6 && cols[3] == "/" && cols[4] == "/" {
++ if len(cols) >= 6 && cols[4] == "/" {
+ return strings.HasPrefix(cols[6], "shared")
+ }
+ }
@@ -8115,9 +9859,9 @@ diff -uNr docker-0.6.2/utils.go docker-devmapper/utils.go
+ _, err = io.Copy(dstFile, srcFile)
+ return err
+}
-diff -uNr docker-0.6.2/utils_test.go docker-devmapper/utils_test.go
---- docker-0.6.2/utils_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/utils_test.go 2013-09-23 10:37:39.237305401 -0500
+diff -uNr docker-0.6.3/utils_test.go docker/utils_test.go
+--- docker-0.6.3/utils_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/utils_test.go 2013-09-26 14:37:16.158935659 -0500
@@ -2,6 +2,7 @@
import (
@@ -8135,29 +9879,29 @@ diff -uNr docker-0.6.2/utils_test.go docker-devmapper/utils_test.go
if err != nil {
return nil, err
}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/AUTHORS docker-devmapper/vendor/src/code.google.com/p/go.net/AUTHORS
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/AUTHORS 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/AUTHORS 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/AUTHORS docker/vendor/src/code.google.com/p/go.net/AUTHORS
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/AUTHORS 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/AUTHORS 1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-# This source code refers to The Go Authors for copyright purposes.
-# The master list of authors is in the main Go distribution,
-# visible at http://tip.golang.org/AUTHORS.
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/codereview.cfg docker-devmapper/vendor/src/code.google.com/p/go.net/codereview.cfg
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/codereview.cfg 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/codereview.cfg 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/codereview.cfg docker/vendor/src/code.google.com/p/go.net/codereview.cfg
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/codereview.cfg 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/codereview.cfg 1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-defaultcc: golang-dev at googlegroups.com
-contributors: http://go.googlecode.com/hg/CONTRIBUTORS
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/CONTRIBUTORS docker-devmapper/vendor/src/code.google.com/p/go.net/CONTRIBUTORS
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/CONTRIBUTORS 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/CONTRIBUTORS 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/CONTRIBUTORS docker/vendor/src/code.google.com/p/go.net/CONTRIBUTORS
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/CONTRIBUTORS 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/CONTRIBUTORS 1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-# This source code was written by the Go contributors.
-# The master list of contributors is in the main Go distribution,
-# visible at http://tip.golang.org/CONTRIBUTORS.
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/dict/dict.go docker-devmapper/vendor/src/code.google.com/p/go.net/dict/dict.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/dict/dict.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/dict/dict.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/dict/dict.go docker/vendor/src/code.google.com/p/go.net/dict/dict.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/dict/dict.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/dict/dict.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,210 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -8369,15 +10113,15 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/dict/dict.go docker-d
- }
- return string(b[0:w])
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/.hgignore docker-devmapper/vendor/src/code.google.com/p/go.net/.hgignore
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/.hgignore 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/.hgignore 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/.hgignore docker/vendor/src/code.google.com/p/go.net/.hgignore
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/.hgignore 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/.hgignore 1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-syntax:glob
-last-change
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/atom.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/atom.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/atom.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/atom.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/atom.go docker/vendor/src/code.google.com/p/go.net/html/atom/atom.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/atom.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/atom/atom.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,78 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -8457,9 +10201,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/atom.go doc
- }
- return string(s)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go docker/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/atom/atom_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,109 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -8570,9 +10314,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/atom_test.g
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/gen.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/gen.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/gen.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/gen.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/gen.go docker/vendor/src/code.google.com/p/go.net/html/atom/gen.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/gen.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/atom/gen.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,636 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -9210,9 +10954,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/gen.go dock
- "tt",
- "xmp",
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/table.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/table.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/table.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/table.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/table.go docker/vendor/src/code.google.com/p/go.net/html/atom/table.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/table.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/atom/table.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,694 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
@@ -9908,9 +11652,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/table.go do
- "aponstalledonstorageonsubmitempropenonsuspendonunloadonvolum" +
- "echangeonwaitingoptimumanifestepromptoptionbeforeunloaddress" +
- "tylesummarysupsvgsystemarquee"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/table_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/table_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/table_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/atom/table_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/table_test.go docker/vendor/src/code.google.com/p/go.net/html/atom/table_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/atom/table_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/atom/table_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,341 +0,0 @@
-// generated by go run gen.go -test; DO NOT EDIT
-
@@ -10253,9 +11997,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/atom/table_test.
- "wrap",
- "xmp",
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/const.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/const.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/const.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/const.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/const.go docker/vendor/src/code.google.com/p/go.net/html/const.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/const.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/const.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,100 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -10357,9 +12101,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/const.go docker-
- }
- return false
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/doc.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/doc.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/doc.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/doc.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/doc.go docker/vendor/src/code.google.com/p/go.net/html/doc.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/doc.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/doc.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,106 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -10467,9 +12211,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/doc.go docker-de
-
-// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
-// TODO(nigeltao): How does parsing interact with a JavaScript engine?
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/doctype.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/doctype.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/doctype.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/doctype.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/doctype.go docker/vendor/src/code.google.com/p/go.net/html/doctype.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/doctype.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/doctype.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,156 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -10627,9 +12371,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/doctype.go docke
- "-//webtechs//dtd mozilla html 2.0//",
- "-//webtechs//dtd mozilla html//",
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/entity.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/entity.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/entity.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/entity.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/entity.go docker/vendor/src/code.google.com/p/go.net/html/entity.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/entity.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/entity.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,2253 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -12884,9 +14628,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/entity.go docker
- "vsupnE;": {'\u2ACC', '\uFE00'},
- "vsupne;": {'\u228B', '\uFE00'},
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/entity_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/entity_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/entity_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/entity_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/entity_test.go docker/vendor/src/code.google.com/p/go.net/html/entity_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/entity_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/entity_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,29 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -12917,9 +14661,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/entity_test.go d
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/escape.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/escape.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/escape.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/escape.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/escape.go docker/vendor/src/code.google.com/p/go.net/html/escape.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/escape.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/escape.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,258 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -13179,9 +14923,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/escape.go docker
- }
- return s
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/example_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/example_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/example_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/example_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/example_test.go docker/vendor/src/code.google.com/p/go.net/html/example_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/example_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/example_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,40 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -13223,9 +14967,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/example_test.go
- // foo
- // /bar/baz
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/foreign.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/foreign.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/foreign.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/foreign.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/foreign.go docker/vendor/src/code.google.com/p/go.net/html/foreign.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/foreign.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/foreign.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,226 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -13453,9 +15197,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/foreign.go docke
- "ychannelselector": "yChannelSelector",
- "zoomandpan": "zoomAndPan",
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/node.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/node.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/node.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/node.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/node.go docker/vendor/src/code.google.com/p/go.net/html/node.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/node.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/node.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,193 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -13650,9 +15394,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/node.go docker-d
- (*s)[j] = nil
- *s = (*s)[:j]
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/node_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/node_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/node_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/node_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/node_test.go docker/vendor/src/code.google.com/p/go.net/html/node_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/node_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/node_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,146 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -13800,9 +15544,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/node_test.go doc
-
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/parse.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/parse.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/parse.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/parse.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/parse.go docker/vendor/src/code.google.com/p/go.net/html/parse.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/parse.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/parse.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,2092 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -15896,9 +17640,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/parse.go docker-
- }
- return result, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/parse_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/parse_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/parse_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/parse_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/parse_test.go docker/vendor/src/code.google.com/p/go.net/html/parse_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/parse_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/parse_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,388 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -16288,9 +18032,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/parse_test.go do
- Parse(bytes.NewBuffer(buf))
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/render.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/render.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/render.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/render.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/render.go docker/vendor/src/code.google.com/p/go.net/html/render.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/render.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/render.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,271 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -16563,9 +18307,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/render.go docker
- "track": true,
- "wbr": true,
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/render_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/render_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/render_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/render_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/render_test.go docker/vendor/src/code.google.com/p/go.net/html/render_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/render_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/render_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,156 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -16723,9 +18467,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/render_test.go d
- t.Errorf("got vs want:\n%s\n%s\n", got, want)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/go1.html docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/go1.html
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/go1.html 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/go1.html 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/go1.html docker/vendor/src/code.google.com/p/go.net/html/testdata/go1.html
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/go1.html 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/go1.html 1969-12-31 18:00:00.000000000 -0600
@@ -1,2237 +0,0 @@
-<!DOCTYPE html>
-<html>
@@ -18964,9 +20708,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/go1.htm
-</script>
-</html>
-
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,194 +0,0 @@
-#data
-<a><p></a></p>
@@ -19162,9 +20906,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <svg svg>
-| <svg tr>
-| <svg input>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,31 +0,0 @@
-#data
-<b>1<i>2<p>3</b>4
@@ -19197,9 +20941,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <address>
-| <a>
-| <a>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,135 +0,0 @@
-#data
-FOO<!-- BAR -->BAZ
@@ -19336,9 +21080,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| "FOO"
-| <!-- - -->
-| "BAZ"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,370 +0,0 @@
-#data
-<!DOCTYPE html>Hello
@@ -19710,9 +21454,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <html>
-| <head>
-| <body>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,603 +0,0 @@
-#data
-FOO>BAR
@@ -20317,9 +22061,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <head>
-| <body>
-| "FOO�ZOO"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,249 +0,0 @@
-#data
-<div bar="ZZ>YY"></div>
@@ -20570,9 +22314,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <div>
-| "ZZ&prod=23"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,246 +0,0 @@
-#data
-<div<div>
@@ -20820,9 +22564,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <head>
-| <body>
-| <math math>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,43 +0,0 @@
-#data
-<button>1</foo>
@@ -20867,9 +22611,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| "1"
-| <dd>
-| "2"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,40 +0,0 @@
-#data
-<isindex>
@@ -20911,9 +22655,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <head>
-| <body>
-| <form>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,52 +0,0 @@
-#data
-<input type="hidden"><frameset>
@@ -20967,11 +22711,11 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <svg desc>
-| <td>
-| <circle>
-Binary files docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat and docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat differ
-Binary files docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat and docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat differ
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README 1969-12-31 18:00:00.000000000 -0600
+Binary files docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat and docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat differ
+Binary files docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat and docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat differ
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/README 1969-12-31 18:00:00.000000000 -0600
@@ -1,28 +0,0 @@
-The *.dat files in this directory are copied from The WebKit Open Source
-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
@@ -21001,9 +22745,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,308 +0,0 @@
-#data
-FOO<script>'Hello'</script>BAR
@@ -21313,9 +23057,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| type="text/plain"
-| "'<!-- <sCrIpt/'</script>BAR"
-| "QUX"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-#data
-<p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
@@ -21332,9 +23076,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <b>
-| id="A"
-| "TEXT"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,28 +0,0 @@
-#data
-1<script>document.write("2")</script>3
@@ -21364,9 +23108,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <script>
-| "document.write('3')"
-| "34"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,212 +0,0 @@
-#data
-<table><th>
@@ -21580,9 +23324,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <svg svg>
-| <svg desc>
-| <td>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,799 +0,0 @@
-#data
-<!DOCTYPE html><svg></svg>
@@ -22383,9 +24127,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <span>
-| <svg path>
-| <math mi>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,482 +0,0 @@
-#data
-<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelecto
r='' yChannelSelector='' zoomAndPan=''></svg>
@@ -22869,9 +24613,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <svg svg>
-| <svg solidcolor>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,62 +0,0 @@
-#data
-<!DOCTYPE html><body><p>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
@@ -22935,9 +24679,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <svg g>
-| "quux"
-| "bar"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,74 +0,0 @@
-#data
-<!DOCTYPE html><html><body><xyz:abc></xyz:abc>
@@ -23013,9 +24757,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <head>
-| <body>
-| 789="012"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,208 +0,0 @@
-#data
-<!DOCTYPE html><p><b><i><u></p> <p>X
@@ -23225,9 +24969,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <head>
-| <body>
-| <object>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,2299 +0,0 @@
-#data
-<!doctype html><script>
@@ -25528,9 +27272,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <form>
-| <table>
-| <form>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,153 +0,0 @@
-#data
-<!doctype html><table><tbody><select><tr>
@@ -25685,9 +27429,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <tbody>
-| <tr>
-| "a"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,269 +0,0 @@
-#data
-<!doctype html><plaintext></plaintext>
@@ -25958,9 +27702,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <svg svg>
-| "abc"
-| <td>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,1237 +0,0 @@
-#data
-<!doctype html><math><mn DefinitionUrl="foo">
@@ -27199,9 +28943,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <p>
-| "c"
-| "d"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,1952 +0,0 @@
-#data
-Test
@@ -29155,9 +30899,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <html>
-| <head>
-| <frameset>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,455 +0,0 @@
-#data
-<!doctype html><p><button><button>
@@ -29614,9 +31358,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <math annotation-xml>
-| encoding=" text/html "
-| <div>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,221 +0,0 @@
-#data
-<svg><![CDATA[foo]]>
@@ -29839,9 +31583,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <svg svg>
-| "<!--svg-->"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,157 +0,0 @@
-#data
-<a><b><big><em><strong><div>X</a>
@@ -30000,9 +31744,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <b>
-| "X"
-| "TEST"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,155 +0,0 @@
-#data
-<p><font size=4><font color=red><font size=4><font size=4><font size=4><font size=4><font size=4><font color=red><p>X
@@ -30159,9 +31903,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| id="a"
-| <b>
-| "Y"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,79 +0,0 @@
-#data
-<!DOCTYPE html>≂̸
@@ -30242,9 +31986,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <head>
-| <body>
-| "𝔾A"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,219 +0,0 @@
-#data
-<!DOCTYPE html><body><foo>A
@@ -30465,9 +32209,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <wbr>
-| "A"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,313 +0,0 @@
-#data
-<!DOCTYPE html><body><a href='#1'><nobr>1<nobr></a><br><a href='#2'><nobr>2<nobr></a><br><a href='#3'><nobr>3<nobr></a>
@@ -30782,9 +32526,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <div>
-| <!-- /div -->
-| "a"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,763 +0,0 @@
-#data
-<!DOCTYPE html>Test
@@ -31549,9 +33293,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <div>
-| <form>
-| <div>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,305 +0,0 @@
-#data
-<head></head><style></style>
@@ -31858,9 +33602,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <p>
-| <table>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,59 +0,0 @@
-#data
-direct div content
@@ -31921,9 +33665,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-#document
-| <title>
-| "setting head's innerHTML"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,191 +0,0 @@
-#data
-<style> <!-- </style>x
@@ -32116,9 +33860,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| "<!--"
-| <body>
-| "-->"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,663 +0,0 @@
-#data
-<!doctype html></head> <head>
@@ -32783,9 +34527,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <html>
-| <head>
-| <frameset>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,390 +0,0 @@
-#data
-<!doctype html><body><title>X</title>
@@ -33177,9 +34921,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <select>
-| <keygen>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,148 +0,0 @@
-#data
-<div>
@@ -33329,9 +35073,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <a>
-| <p>
-| <a>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,457 +0,0 @@
-#data
-<!DOCTYPE html><math></math>
@@ -33790,9 +35534,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| xlink href="foo"
-| xml lang="en"
-| "bar"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,741 +0,0 @@
-#data
-<body><span>
@@ -34535,9 +36279,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-#document
-| <head>
-| <body>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,261 +0,0 @@
-#data
-<b><p>Bold </b> Not bold</p>
@@ -34800,9 +36544,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| "
-
-"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,610 +0,0 @@
-#data
-Test
@@ -35414,9 +37158,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-| <body>
-| <input>
-| type="button"
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat 1969-12-31 18:00:00.000000000 -0600
@@ -1,159 +0,0 @@
-#data
-<foo bar=qux/>
@@ -35577,9 +37321,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/testdata/webkit/
-select
-#document
-| <option>
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/token.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/token.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/token.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/token.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/token.go docker/vendor/src/code.google.com/p/go.net/html/token.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/token.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/token.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,1174 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -36755,9 +38499,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/token.go docker-
- }
- return z
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/token_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/html/token_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/html/token_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/html/token_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/html/token_test.go docker/vendor/src/code.google.com/p/go.net/html/token_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/html/token_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/html/token_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,679 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -37438,9 +39182,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/html/token_test.go do
-func BenchmarkRawLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, rawLevel) }
-func BenchmarkLowLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, lowLevel) }
-func BenchmarkHighLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, highLevel) }
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/idna.go docker-devmapper/vendor/src/code.google.com/p/go.net/idna/idna.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/idna.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/idna/idna.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/idna.go docker/vendor/src/code.google.com/p/go.net/idna/idna.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/idna.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/idna/idna.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,68 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -37510,9 +39254,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/idna.go docker-d
- }
- return true
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/idna_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/idna/idna_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/idna_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/idna/idna_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/idna_test.go docker/vendor/src/code.google.com/p/go.net/idna/idna_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/idna_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/idna/idna_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,43 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -37557,9 +39301,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/idna_test.go doc
-
-// TODO(nigeltao): test errors, once we've specified when ToASCII and ToUnicode
-// return errors.
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/punycode.go docker-devmapper/vendor/src/code.google.com/p/go.net/idna/punycode.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/punycode.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/idna/punycode.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/punycode.go docker/vendor/src/code.google.com/p/go.net/idna/punycode.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/punycode.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/idna/punycode.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,200 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -37761,9 +39505,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/punycode.go dock
- }
- return k + (base-tmin+1)*delta/(delta+skew)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/punycode_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/idna/punycode_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/punycode_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/idna/punycode_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/punycode_test.go docker/vendor/src/code.google.com/p/go.net/idna/punycode_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/idna/punycode_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/idna/punycode_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,198 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -37963,9 +39707,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/idna/punycode_test.go
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go docker/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,121 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38088,9 +39832,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_bsd.go d
- // TODO(mikio): Implement IP_PKTINFO stuff when OS X 10.8 comes
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control.go docker/vendor/src/code.google.com/p/go.net/ipv4/control.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/control.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,52 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38144,9 +39888,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control.go docke
- }
- return fmt.Sprintf("ttl: %v, src: %v, dst: %v, ifindex: %v", cm.TTL, cm.Src, cm.Dst, cm.IfIndex)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go docker/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,126 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38274,9 +40018,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_linux.go
- }
- return
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38305,9 +40049,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_plan9.go
- // TODO(mikio): Implement this
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go docker/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/control_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38336,9 +40080,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/control_windows.
- // TODO(mikio): Implement this
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,50 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38390,9 +40134,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_plan9.g
- // TODO(mikio): Implement this
- return syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go docker/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,125 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38519,9 +40263,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/dgramopt_posix.g
- }
- return leaveIPv4Group(fd, ifi, grp)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/doc.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/doc.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/doc.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/doc.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/doc.go docker/vendor/src/code.google.com/p/go.net/ipv4/doc.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/doc.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/doc.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,196 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38719,9 +40463,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/doc.go docker-de
-// // error handling
-// }
-package ipv4
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go docker/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,181 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -38904,9 +40648,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/endpoint.go dock
- }
- return r, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/example_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/example_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/example_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/example_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/example_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/example_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/example_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/example_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,283 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39191,9 +40935,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/example_test.go
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,29 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39224,9 +40968,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/genericopt_plan9
- // TODO(mikio): Implement this
- return syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go docker/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,61 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39289,9 +41033,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/genericopt_posix
- }
- return setIPv4TTL(fd, ttl)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/gen.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/gen.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/gen.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/gen.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/gen.go docker/vendor/src/code.google.com/p/go.net/ipv4/gen.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/gen.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/gen.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,252 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39545,9 +41289,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/gen.go docker-de
- }
- return prs
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/gentest.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/gentest.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/gentest.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/gentest.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/gentest.go docker/vendor/src/code.google.com/p/go.net/ipv4/gentest.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/gentest.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/gentest.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,196 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39745,9 +41489,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/gentest.go docke
- }
- return trs
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/header.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/header.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/header.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/header.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/header.go docker/vendor/src/code.google.com/p/go.net/ipv4/header.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/header.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/header.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,149 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39898,9 +41642,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/header.go docker
- }
- return h, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/header_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/header_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/header_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/header_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/header_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/header_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/header_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/header_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,95 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -39997,9 +41741,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/header_test.go d
- t.Fatalf("ipv4.ParseHeader failed: %#v not equal %#v", h, testHeader)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper.go docker/vendor/src/code.google.com/p/go.net/ipv4/helper.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/helper.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,85 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40086,9 +41830,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper.go docker
- }
- return nil, errNoSuchInterface
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40117,9 +41861,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_plan9.go
- // TODO(mikio): Implement this
- return 0, syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go docker/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,42 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40163,9 +41907,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_posix.go
- }
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go docker/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,50 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40217,9 +41961,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_unix.go d
- }
- return 0, errInvalidConnType
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go docker/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,49 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40270,9 +42014,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/helper_windows.g
- }
- return syscall.InvalidHandle, errInvalidConnType
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/iana.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/iana.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/iana.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/iana.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/iana.go docker/vendor/src/code.google.com/p/go.net/ipv4/iana.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/iana.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/iana.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,179 +0,0 @@
-// go run gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
@@ -40453,9 +42197,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/iana.go docker-d
- ianaProtocolROHC = 142 // Robust Header Compression
- ianaProtocolReserved = 255 // Reserved
-)
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-// go run gentv.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
@@ -40495,9 +42239,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/iana_test.go doc
- ECNTransport0 = 0x2 // ECT(0) (ECN-Capable Transport(0))
- CongestionExperienced = 0x3 // CE (Congestion Experienced)
-)
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/icmp.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/icmp.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/icmp.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/icmp.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/icmp.go docker/vendor/src/code.google.com/p/go.net/ipv4/icmp.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/icmp.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/icmp.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40515,9 +42259,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/icmp.go docker-d
- }
- return s
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,111 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40630,9 +42374,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/mockicmp_test.go
- }
- return p, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,124 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40758,9 +42502,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/mocktransponder_
- }
- return ip, true
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/multicastlistener_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,237 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -40999,9 +42743,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicastlistene
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,126 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41129,9 +42873,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicastsockopt
- t.Fatalf("ipv4.PacketConn.LeaveGroup(%v) failed: %v", gaddr, err)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,168 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41301,9 +43045,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/multicast_test.g
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/packet.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/packet.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/packet.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/packet.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/packet.go docker/vendor/src/code.google.com/p/go.net/ipv4/packet.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/packet.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/packet.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,97 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41402,9 +43146,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/packet.go docker
- _, _, err = c.c.WriteMsgIP(wh, oob, dst)
- return err
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/payload.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/payload.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/payload.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/payload.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/payload.go docker/vendor/src/code.google.com/p/go.net/ipv4/payload.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/payload.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/payload.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,81 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41487,9 +43231,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/payload.go docke
- }
- return
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,95 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41586,9 +43330,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_bsd.go d
- }
- return os.NewSyscallError("setsockopt", syscall.SetsockoptIPMreq(fd, ianaProtocolIP, syscall.IP_DROP_MEMBERSHIP, &mreq))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41612,9 +43356,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_freebsd.
-func setIPv4SendSourceAddress(fd int, v bool) error {
- return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd, ianaProtocolIP, syscall.IP_SENDSRCADDR, boolint(v)))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,94 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41710,9 +43454,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_linux.go
- }
- return os.NewSyscallError("setsockopt", syscall.SetsockoptIPMreqn(fd, ianaProtocolIP, syscall.IP_DROP_MEMBERSHIP, &mreqn))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41731,9 +43475,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_plan9.go
- // TODO(mikio): Implement this
- return syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,60 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41795,9 +43539,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_unix.go
-func setIPv4HeaderPrepend(fd int, v bool) error {
- return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd, ianaProtocolIP, syscall.IP_HDRINCL, boolint(v)))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,146 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -41945,9 +43689,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/sockopt_windows.
- }
- return os.NewSyscallError("setsockopt", syscall.Setsockopt(fd, ianaProtocolIP, syscall.IP_DROP_MEMBERSHIP, (*byte)(unsafe.Pointer(&mreq)), int32(unsafe.Sizeof(mreq))))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,145 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -42094,9 +43838,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/unicastsockopt_t
-
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go docker/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,192 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -42290,9 +44034,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv4/unicast_test.go
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control.go docker/vendor/src/code.google.com/p/go.net/ipv6/control.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,84 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -42378,9 +44122,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control.go docke
- }
- return fmt.Sprintf("tclass: %#x, hoplim: %v, src: %v, dst: %v, ifindex: %v, nexthop: %v, mtu: %v", cm.TrafficClass, cm.HopLimit, cm.Src, cm.Dst, cm.IfIndex, cm.NextHop, cm.MTU)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,151 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -42533,9 +44277,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc2292_
- }
- return
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,213 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -42750,9 +44494,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_
- }
- return
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,217 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -42971,9 +44715,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_
- }
- return
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43002,9 +44746,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_
- // TODO(mikio): Implement this
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43033,9 +44777,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_rfc3542_
- // TODO(mikio): Implement this
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/control_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/control_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/control_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/control_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,42 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43079,9 +44823,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/control_test.go
- t.Fatalf("got %#x; expected %#x", opt.cflags, FlagHopLimit)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,96 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43179,9 +44923,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_plan9.g
- // TODO(mikio): Implement this
- return syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go docker/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,178 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43361,9 +45105,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/dgramopt_posix.g
- }
- return setIPv6ICMPFilter(fd, f)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/doc.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/doc.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/doc.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/doc.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/doc.go docker/vendor/src/code.google.com/p/go.net/ipv6/doc.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/doc.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/doc.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,193 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43558,9 +45302,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/doc.go docker-de
-// // error handling
-// }
-package ipv6
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go docker/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,119 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43681,9 +45425,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/endpoint.go dock
- payloadHandler: payloadHandler{PacketConn: c},
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,34 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43719,9 +45463,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/genericopt_plan9
- // TODO(mikio): Implement this
- return syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go docker/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,60 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -43783,9 +45527,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/genericopt_posix
- }
- return setIPv6HopLimit(fd, hoplim)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/gen.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/gen.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/gen.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/gen.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/gen.go docker/vendor/src/code.google.com/p/go.net/ipv6/gen.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/gen.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/gen.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,247 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44034,9 +45778,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/gen.go docker-de
- }
- return prs
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/gentest.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/gentest.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/gentest.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/gentest.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/gentest.go docker/vendor/src/code.google.com/p/go.net/ipv6/gentest.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/gentest.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/gentest.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,196 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44234,9 +45978,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/gentest.go docke
- }
- return trs
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper.go docker/vendor/src/code.google.com/p/go.net/ipv6/helper.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/helper.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,28 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44266,9 +46010,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper.go docker
- }
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44292,9 +46036,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_plan9.go
- // TODO(mikio): Implement this
- return 0, syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go docker/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,46 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44342,9 +46086,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_unix.go d
- }
- return 0, errInvalidConnType
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go docker/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,45 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44391,9 +46135,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/helper_windows.g
- }
- return syscall.InvalidHandle, errInvalidConnType
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/iana.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/iana.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/iana.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/iana.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/iana.go docker/vendor/src/code.google.com/p/go.net/ipv6/iana.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/iana.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/iana.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,224 +0,0 @@
-// go run gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
@@ -44619,9 +46363,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/iana.go docker-d
- ianaProtocolROHC = 142 // Robust Header Compression
- ianaProtocolReserved = 255 // Reserved
-)
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
-// go run gentv.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
@@ -44661,9 +46405,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/iana_test.go doc
- ECNTransport0 = 0x2 // ECT(0) (ECN-Capable Transport(0))
- CongestionExperienced = 0x3 // CE (Congestion Experienced)
-)
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,35 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44700,9 +46444,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_bsd.go dock
-func (f *rawICMPFilter) willBlock(typ ICMPType) bool {
- return f.Filt[typ>>5]&(1<<(uint32(typ)&31)) == 0
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp.go docker/vendor/src/code.google.com/p/go.net/ipv6/icmp.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/icmp.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,46 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44750,9 +46494,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp.go docker-d
- defer f.mu.RUnlock()
- return f.willBlock(typ)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,33 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44787,9 +46531,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_linux.go do
-func (f *rawICMPFilter) willBlock(typ ICMPType) bool {
- return f.Data[typ>>5]&(1<<(uint32(typ)&31)) != 0
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44813,9 +46557,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_plan9.go do
- // TODO(mikio): Implement this
- return false
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,84 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44901,9 +46645,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_test.go doc
- t.Fatalf("got unexpected filter %#v; expected %#v", kf, f)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -44927,9 +46671,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/icmp_windows.go
- // TODO(mikio): Implement this
- return false
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,112 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45043,9 +46787,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/mockicmp_test.go
- }
- return p, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,110 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45157,9 +46901,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/mocktransponder_
- return
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/multicastlistener_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,197 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45358,9 +47102,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicastlistene
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,76 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45438,9 +47182,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicastsockopt
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,161 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45603,9 +47347,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/multicast_test.g
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go docker/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,70 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45677,9 +47421,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload_cmsg.go
- }
- return
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/payload.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/payload.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/payload.go docker/vendor/src/code.google.com/p/go.net/ipv6/payload.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/payload.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/payload.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45696,9 +47440,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload.go docke
-}
-
-func (c *payloadHandler) ok() bool { return c != nil && c.PacketConn != nil }
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go docker/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,41 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45741,9 +47485,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/payload_noncmsg.
- }
- return c.PacketConn.WriteTo(b, dst)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,66 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45811,9 +47555,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_
-func setIPv6ICMPFilter(fd int, f *ICMPFilter) error {
- return os.NewSyscallError("setsockopt", syscall.SetsockoptICMPv6Filter(fd, ianaProtocolIPv6ICMP, syscall.ICMP6_FILTER, &f.rawICMPFilter.ICMPv6Filter))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,19 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45834,9 +47578,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_
- }
- return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd, ianaProtocolIPv6, syscall.IPV6_CHECKSUM, offset))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45855,9 +47599,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_
- }
- return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd, ianaProtocolReserved, syscall.IPV6_CHECKSUM, offset))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,114 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -45973,9 +47717,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_
- }
- return os.NewSyscallError("setsockopt", syscall.SetsockoptIPv6Mreq(fd, ianaProtocolIPv6, syscall.IPV6_LEAVE_GROUP, &mreq))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,116 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46093,9 +47837,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_
- // TODO(mikio): Implement this
- return syscall.EWINDOWS
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,44 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46141,9 +47885,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_
-func setIPv6ICMPFilter(fd int, f *ICMPFilter) error {
- return os.NewSyscallError("setsockopt", syscall.SetsockoptICMPv6Filter(fd, ianaProtocolIPv6ICMP, syscall.ICMP6_FILTER, &f.rawICMPFilter.ICMPv6Filter))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,42 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46187,9 +47931,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_
-func setIPv6ICMPFilter(fd int, f *ICMPFilter) error {
- return os.NewSyscallError("setsockopt", syscall.SetsockoptICMPv6Filter(fd, ianaProtocolIPv6ICMP, syscall.ICMPV6_FILTER, &f.rawICMPFilter.ICMPv6Filter))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,12 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46203,9 +47947,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_
- // TODO(mikio): Implement this
- return 0, syscall.EPLAN9
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,48 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46255,9 +47999,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_
-func setIPv6ReceivePacketInfo(fd int, v bool) error {
- return os.NewSyscallError("setsockopt", syscall.SetsockoptInt(fd, ianaProtocolIPv6, syscall.IPV6_RECVPKTINFO, boolint(v)))
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_windows.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,62 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46321,9 +48065,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_
- // TODO(mikio): Implement this
- return syscall.EWINDOWS
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,136 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46461,9 +48205,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/sockopt_test.go
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,101 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46566,9 +48310,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/unicastsockopt_t
- t.Fatalf("got unexpected hop limit %v; expected %v", v, hoplim)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go docker/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,203 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46773,9 +48517,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/ipv6/unicast_test.go
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/LICENSE docker-devmapper/vendor/src/code.google.com/p/go.net/LICENSE
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/LICENSE 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/LICENSE 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/LICENSE docker/vendor/src/code.google.com/p/go.net/LICENSE
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/LICENSE 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/LICENSE 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
@@ -46804,9 +48548,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/LICENSE docker-devmap
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/PATENTS docker-devmapper/vendor/src/code.google.com/p/go.net/PATENTS
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/PATENTS 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/PATENTS 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/PATENTS docker/vendor/src/code.google.com/p/go.net/PATENTS
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/PATENTS 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/PATENTS 1969-12-31 18:00:00.000000000 -0600
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
@@ -46830,9 +48574,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/PATENTS docker-devmap
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/direct.go docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/direct.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/direct.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/direct.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/direct.go docker/vendor/src/code.google.com/p/go.net/proxy/direct.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/direct.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/proxy/direct.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,18 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46852,9 +48596,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/direct.go docke
-func (direct) Dial(network, addr string) (net.Conn, error) {
- return net.Dial(network, addr)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/per_host.go docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/per_host.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/per_host.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/per_host.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/per_host.go docker/vendor/src/code.google.com/p/go.net/proxy/per_host.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/per_host.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/proxy/per_host.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,140 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -46996,9 +48740,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/per_host.go doc
- }
- p.bypassHosts = append(p.bypassHosts, host)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go docker/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/proxy/per_host_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,55 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -47055,9 +48799,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/per_host_test.g
- t.Errorf("Hosts which went to the bypass proxy didn't match. Got %v, want %v", bypass.addrs, expectedBypass)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/proxy.go docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/proxy.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/proxy.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/proxy.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/proxy.go docker/vendor/src/code.google.com/p/go.net/proxy/proxy.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/proxy.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/proxy/proxy.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,94 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -47153,9 +48897,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/proxy.go docker
-
- return nil, errors.New("proxy: unknown scheme: " + u.Scheme)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go docker/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,142 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -47299,9 +49043,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/proxy_test.go d
- return
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/socks5.go docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/socks5.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/socks5.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/proxy/socks5.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/socks5.go docker/vendor/src/code.google.com/p/go.net/proxy/socks5.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/proxy/socks5.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/proxy/socks5.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,207 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -47510,9 +49254,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/proxy/socks5.go docke
- closeConn = nil
- return conn, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go docker/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,570 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -48084,9 +49828,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/gen.go d
- }
- return text
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/list.go docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/list.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/list.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/list.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/list.go docker/vendor/src/code.google.com/p/go.net/publicsuffix/list.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/list.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/publicsuffix/list.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,133 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -48221,9 +49965,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/list.go
- }
- return domain[1+strings.LastIndex(domain[:i], "."):], nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go docker/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/publicsuffix/list_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,404 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -48629,9 +50373,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/list_tes
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/table.go docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/table.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/table.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/table.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/table.go docker/vendor/src/code.google.com/p/go.net/publicsuffix/table.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/table.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/publicsuffix/table.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,6877 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
@@ -55510,9 +57254,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/table.go
- 0x05f8d7d7, // c0x0166 (n0x17d7-n0x17e3) +
- 0x05fa97e3, // c0x0167 (n0x17e3-n0x17ea) +
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go docker/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/publicsuffix/table_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,12226 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
@@ -67740,16 +69484,16 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/publicsuffix/table_te
- "net",
- "org",
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/README docker-devmapper/vendor/src/code.google.com/p/go.net/README
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/README 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/README 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/README docker/vendor/src/code.google.com/p/go.net/README
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/README 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/README 1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-This repository holds supplementary Go networking libraries.
-
-To submit changes to this repository, see http://golang.org/doc/contribute.html.
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/dictionary.go docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/dictionary.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/dictionary.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/dictionary.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/dictionary.go docker/vendor/src/code.google.com/p/go.net/spdy/dictionary.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/dictionary.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/spdy/dictionary.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,187 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -67938,9 +69682,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/dictionary.go do
- 0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a,
- 0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e,
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/read.go docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/read.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/read.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/read.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/read.go docker/vendor/src/code.google.com/p/go.net/spdy/read.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/read.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/spdy/read.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,348 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -68290,9 +70034,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/read.go docker-d
- }
- return &frame, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go docker/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,644 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -68938,9 +70682,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/spdy_test.go doc
- t.Errorf("%s ZeroStreamId, incorrect error %#v, frame %s", method, eerr, frame)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/types.go docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/types.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/types.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/types.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/types.go docker/vendor/src/code.google.com/p/go.net/spdy/types.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/types.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/spdy/types.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,275 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -69217,9 +70961,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/types.go docker-
- }
- return framer, nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/write.go docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/write.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/write.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/spdy/write.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/write.go docker/vendor/src/code.google.com/p/go.net/spdy/write.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/spdy/write.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/spdy/write.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,318 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -69539,9 +71283,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/spdy/write.go docker-
- }
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/client.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/client.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/client.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/client.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/client.go docker/vendor/src/code.google.com/p/go.net/websocket/client.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/client.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/client.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,112 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -69655,9 +71399,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/client.go d
-Error:
- return nil, &DialError{config, err}
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go docker/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/exampledial_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,31 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -69690,9 +71434,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/exampledial
- }
- fmt.Printf("Received: %s.\n", msg[:n])
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go docker/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/examplehandler_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,26 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -69720,9 +71464,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/examplehand
- panic("ListenAndServe: " + err.Error())
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hixie.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hixie.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hixie.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hixie.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hixie.go docker/vendor/src/code.google.com/p/go.net/websocket/hixie.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hixie.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/hixie.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,695 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -70419,9 +72163,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hixie.go do
-func newHixieServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
- return newHixieConn(config, buf, rwc, request)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go docker/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/hixie_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,201 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -70624,9 +72368,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hixie_test.
- t.Errorf("read: %v", err)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hybi.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hybi.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hybi.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hybi.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hybi.go docker/vendor/src/code.google.com/p/go.net/websocket/hybi.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hybi.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/hybi.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,580 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -71208,9 +72952,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hybi.go doc
-func newHybiServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
- return newHybiConn(config, buf, rwc, request)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go docker/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/hybi_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,698 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -71910,9 +73654,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/hybi_test.g
- t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
- }
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/server.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/server.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/server.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/server.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/server.go docker/vendor/src/code.google.com/p/go.net/websocket/server.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/server.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/server.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,122 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -72036,9 +73780,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/server.go d
- s := Server{Handler: h, Handshake: checkOrigin}
- s.serveWebSocket(w, req)
-}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/websocket.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/websocket.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/websocket.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/websocket.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/websocket.go docker/vendor/src/code.google.com/p/go.net/websocket/websocket.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/websocket.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/websocket.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,415 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -72455,9 +74199,9 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/websocket.g
- websocket.JSON.Send(ws, data)
-*/
-var JSON = Codec{jsonMarshal, jsonUnmarshal}
-diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go
---- docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go docker/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go
+--- docker-0.6.3/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/code.google.com/p/go.net/websocket/websocket_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,327 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -72786,10 +74530,10 @@ diff -uNr docker-0.6.2/vendor/src/code.google.com/p/go.net/websocket/websocket_t
- }
- conn.Close()
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/common.go docker-devmapper/vendor/src/github.com/dotcloud/tar/common.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/common.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/common.go 1969-12-31 18:00:00.000000000 -0600
-@@ -1,310 +0,0 @@
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/common.go docker/vendor/src/github.com/dotcloud/tar/common.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/common.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/common.go 1969-12-31 18:00:00.000000000 -0600
+@@ -1,299 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
@@ -72969,18 +74713,19 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/common.go docker-devma
-
-// Keywords for the PAX Extended Header
-const (
-- PAX_ATIME = "atime"
-- PAX_CHARSET = "charset"
-- PAX_COMMENT = "comment"
-- PAX_CTIME = "ctime" // please note that ctime is not a valid pax header.
-- PAX_GID = "gid"
-- PAX_GNAME = "gname"
-- PAX_LINKPATH = "linkpath"
-- PAX_MTIME = "mtime"
-- PAX_PATH = "path"
-- PAX_SIZE = "size"
-- PAX_UID = "uid"
-- PAX_UNAME = "uname"
+- paxAtime = "atime"
+- paxCharset = "charset"
+- paxComment = "comment"
+- paxCtime = "ctime" // please note that ctime is not a valid pax header.
+- paxGid = "gid"
+- paxGname = "gname"
+- paxLinkpath = "linkpath"
+- paxMtime = "mtime"
+- paxPath = "path"
+- paxSize = "size"
+- paxUid = "uid"
+- paxUname = "uname"
+- paxNone = ""
-)
-
-// FileInfoHeader creates a partially-populated Header from fi.
@@ -73067,42 +74812,30 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/common.go docker-devma
- return
-}
-
--func isASCII7Bit(s string) bool {
-- for _, character := range s {
-- if (character & 0x7f) != character {
+-func isASCII(s string) bool {
+- for _, c := range s {
+- if c >= 0x80 {
- return false
- }
- }
- return true
-}
-
--func stripTo7Bits(s string) string {
-- var buffer bytes.Buffer
-- for _, character := range s {
-- if (character & 0x7f) == character {
-- buffer.WriteRune(character)
-- }
+-func toASCII(s string) string {
+- if isASCII(s) {
+- return s
- }
-- return buffer.String()
--}
--
--func stripTo7BitsAndShorten(s string, maxLen int) string {
-- var buffer bytes.Buffer
-- count := 0
-- for _, character := range s {
-- if count == maxLen {
-- break
-- }
-- if (character & 0x7f) == character {
-- buffer.WriteRune(character)
-- count++
+- var buf bytes.Buffer
+- for _, c := range s {
+- if c < 0x80 {
+- buf.WriteByte(byte(c))
- }
- }
-- return buffer.String()
+- return buf.String()
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/example_test.go docker-devmapper/vendor/src/github.com/dotcloud/tar/example_test.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/example_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/example_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/example_test.go docker/vendor/src/github.com/dotcloud/tar/example_test.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/example_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/example_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,79 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -73183,9 +74916,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/example_test.go docker
- // Contents of todo.txt:
- // Get animal handling licence.
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/LICENSE docker-devmapper/vendor/src/github.com/dotcloud/tar/LICENSE
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/LICENSE 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/LICENSE 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/LICENSE docker/vendor/src/github.com/dotcloud/tar/LICENSE
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/LICENSE 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/LICENSE 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
@@ -73214,10 +74947,10 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/LICENSE docker-devmapp
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader.go docker-devmapper/vendor/src/github.com/dotcloud/tar/reader.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/reader.go 1969-12-31 18:00:00.000000000 -0600
-@@ -1,394 +0,0 @@
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/reader.go docker/vendor/src/github.com/dotcloud/tar/reader.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/reader.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/reader.go 1969-12-31 18:00:00.000000000 -0600
+@@ -1,396 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
@@ -73315,45 +75048,45 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader.go docker-devma
-func mergePAX(hdr *Header, headers map[string]string) error {
- for k, v := range headers {
- switch k {
-- case PAX_PATH:
+- case paxPath:
- hdr.Name = v
-- case PAX_LINKPATH:
+- case paxLinkpath:
- hdr.Linkname = v
-- case PAX_GNAME:
+- case paxGname:
- hdr.Gname = v
-- case PAX_UNAME:
+- case paxUname:
- hdr.Uname = v
-- case PAX_UID:
+- case paxUid:
- uid, err := strconv.ParseInt(v, 10, 0)
- if err != nil {
- return err
- }
- hdr.Uid = int(uid)
-- case PAX_GID:
+- case paxGid:
- gid, err := strconv.ParseInt(v, 10, 0)
- if err != nil {
- return err
- }
- hdr.Gid = int(gid)
-- case PAX_ATIME:
+- case paxAtime:
- t, err := parsePAXTime(v)
- if err != nil {
- return err
- }
- hdr.AccessTime = t
-- case PAX_MTIME:
+- case paxMtime:
- t, err := parsePAXTime(v)
- if err != nil {
- return err
- }
- hdr.ModTime = t
-- case PAX_CTIME:
+- case paxCtime:
- t, err := parsePAXTime(v)
- if err != nil {
- return err
- }
- hdr.ChangeTime = t
-- case PAX_SIZE:
+- case paxSize:
- size, err := strconv.ParseInt(v, 10, 0)
- if err != nil {
- return err
@@ -73463,13 +75196,15 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader.go docker-devma
- return x
- }
-
-- // Removing leading spaces.
-- for len(b) > 0 && b[0] == ' ' {
-- b = b[1:]
-- }
-- // Removing trailing NULs and spaces.
-- for len(b) > 0 && (b[len(b)-1] == ' ' || b[len(b)-1] == '\x00') {
-- b = b[0 : len(b)-1]
+- // Because unused fields are filled with NULs, we need
+- // to skip leading NULs. Fields may also be padded with
+- // spaces or NULs.
+- // So we remove leading and trailing NULs and spaces to
+- // be sure.
+- b = bytes.Trim(b, " \x00")
+-
+- if len(b) == 0 {
+- return 0
- }
- x, err := strconv.ParseUint(cString(b), 8, 64)
- if err != nil {
@@ -73612,10 +75347,10 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader.go docker-devma
- tr.err = err
- return
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader_test.go docker-devmapper/vendor/src/github.com/dotcloud/tar/reader_test.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/reader_test.go 1969-12-31 18:00:00.000000000 -0600
-@@ -1,366 +0,0 @@
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/reader_test.go docker/vendor/src/github.com/dotcloud/tar/reader_test.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/reader_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/reader_test.go 1969-12-31 18:00:00.000000000 -0600
+@@ -1,385 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
@@ -73760,6 +75495,25 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader_test.go docker-
- },
- },
- },
+- {
+- file: "testdata/nil-uid.tar", // golang.org/issue/5290
+- headers: []*Header{
+- {
+- Name: "P1050238.JPG.log",
+- Mode: 0664,
+- Uid: 0,
+- Gid: 0,
+- Size: 14,
+- ModTime: time.Unix(1365454838, 0),
+- Typeflag: TypeReg,
+- Linkname: "",
+- Uname: "eyefi",
+- Gname: "eyefi",
+- Devmajor: 0,
+- Devminor: 0,
+- },
+- },
+- },
-}
-
-func TestReader(t *testing.T) {
@@ -73770,6 +75524,7 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader_test.go docker-
- t.Errorf("test %d: Unexpected error: %v", i, err)
- continue
- }
+- defer f.Close()
- tr := NewReader(f)
- for j, header := range test.headers {
- hdr, err := tr.Next()
@@ -73790,7 +75545,6 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader_test.go docker-
- if hdr != nil || err != nil {
- t.Errorf("test %d: Unexpected entry or error: hdr=%v err=%v", i, hdr, err)
- }
-- f.Close()
- }
-}
-
@@ -73982,16 +75736,16 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/reader_test.go docker-
- t.Errorf("incorrect merge: got %+v, want %+v", hdr, want)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/README docker-devmapper/vendor/src/github.com/dotcloud/tar/README
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/README 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/README 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/README docker/vendor/src/github.com/dotcloud/tar/README
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/README 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/README 1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-This is a fork of the upstream Go [archive/tar](http://golang.org/pkg/archive/tar/) package to add PAX header support.
-
-You can monitor the upstream pull request [here](https://codereview.appspot.com/12561043/).
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_atimespec.go docker-devmapper/vendor/src/github.com/dotcloud/tar/stat_atimespec.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_atimespec.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/stat_atimespec.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/stat_atimespec.go docker/vendor/src/github.com/dotcloud/tar/stat_atimespec.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/stat_atimespec.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/stat_atimespec.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -74013,9 +75767,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_atimespec.go dock
-func statCtime(st *syscall.Stat_t) time.Time {
- return time.Unix(st.Ctimespec.Unix())
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_atim.go docker-devmapper/vendor/src/github.com/dotcloud/tar/stat_atim.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_atim.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/stat_atim.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/stat_atim.go docker/vendor/src/github.com/dotcloud/tar/stat_atim.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/stat_atim.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/stat_atim.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -74037,9 +75791,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_atim.go docker-de
-func statCtime(st *syscall.Stat_t) time.Time {
- return time.Unix(st.Ctim.Unix())
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_unix.go docker-devmapper/vendor/src/github.com/dotcloud/tar/stat_unix.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_unix.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/stat_unix.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/stat_unix.go docker/vendor/src/github.com/dotcloud/tar/stat_unix.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/stat_unix.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/stat_unix.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,32 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -74073,9 +75827,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/stat_unix.go docker-de
- // TODO(bradfitz): major/minor device numbers?
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/tar_test.go docker-devmapper/vendor/src/github.com/dotcloud/tar/tar_test.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/tar_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/tar_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/tar_test.go docker/vendor/src/github.com/dotcloud/tar/tar_test.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/tar_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/tar_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,271 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -74348,28 +76102,29 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/tar_test.go docker-dev
- }
- }
-}
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/gnu.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/gnu.tar differ
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/pax.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/pax.tar differ
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/small2.txt docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/small2.txt
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/small2.txt 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/small2.txt 1969-12-31 18:00:00.000000000 -0600
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/gnu.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/gnu.tar differ
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/nil-uid.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/nil-uid.tar differ
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/pax.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/pax.tar differ
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/small2.txt docker/vendor/src/github.com/dotcloud/tar/testdata/small2.txt
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/small2.txt 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/testdata/small2.txt 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Google.com
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/small.txt docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/small.txt
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/small.txt 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/small.txt 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/small.txt docker/vendor/src/github.com/dotcloud/tar/testdata/small.txt
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/small.txt 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/testdata/small.txt 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-Kilts
\ No newline at end of file
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/star.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/star.tar differ
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/ustar.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/ustar.tar differ
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/v7.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/v7.tar differ
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/writer-big.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/writer-big.tar differ
-Binary files docker-0.6.2/vendor/src/github.com/dotcloud/tar/testdata/writer.tar and docker-devmapper/vendor/src/github.com/dotcloud/tar/testdata/writer.tar differ
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devmapper/vendor/src/github.com/dotcloud/tar/writer.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/writer.go 1969-12-31 18:00:00.000000000 -0600
-@@ -1,390 +0,0 @@
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/star.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/star.tar differ
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/ustar.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/ustar.tar differ
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/v7.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/v7.tar differ
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/writer-big.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/writer-big.tar differ
+Binary files docker-0.6.3/vendor/src/github.com/dotcloud/tar/testdata/writer.tar and docker/vendor/src/github.com/dotcloud/tar/testdata/writer.tar differ
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/writer.go docker/vendor/src/github.com/dotcloud/tar/writer.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/writer.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/writer.go 1969-12-31 18:00:00.000000000 -0600
+@@ -1,377 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
@@ -74392,11 +76147,11 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
-)
-
-var (
-- ErrWriteTooLong = errors.New("archive/tar: write too long")
-- ErrFieldTooLong = errors.New("archive/tar: header field too long")
-- ErrWriteAfterClose = errors.New("archive/tar: write after close")
-- errNameTooLong = errors.New("archive/tar: name too long")
-- errFieldTooLongNoAscii = errors.New("archive/tar: header field too long or contains invalid values")
+- ErrWriteTooLong = errors.New("archive/tar: write too long")
+- ErrFieldTooLong = errors.New("archive/tar: header field too long")
+- ErrWriteAfterClose = errors.New("archive/tar: write after close")
+- errNameTooLong = errors.New("archive/tar: name too long")
+- errInvalidHeader = errors.New("archive/tar: header field too long or contains invalid values")
-)
-
-// A Writer provides sequential writing of a tar archive in POSIX.1 format.
@@ -74439,29 +76194,23 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
-}
-
-// Write s into b, terminating it with a NUL if there is room.
--func (tw *Writer) cString(b []byte, s string) {
+-// If the value is too long for the field and allowPax is true add a paxheader record instead
+-func (tw *Writer) cString(b []byte, s string, allowPax bool, paxKeyword string, paxHeaders map[string]string) {
+- needsPaxHeader := allowPax && len(s) > len(b) || !isASCII(s)
+- if needsPaxHeader {
+- paxHeaders[paxKeyword] = s
+- return
+- }
- if len(s) > len(b) {
- if tw.err == nil {
- tw.err = ErrFieldTooLong
- }
- return
- }
-- copy(b, s)
-- if len(s) < len(b) {
-- b[len(s)] = 0
-- }
--}
--
--// Write s into b, terminating it with a NUL if there is room. If the value is too long for the field add a paxheader record instead
--func (tw *Writer) fillHeaderField(b []byte, paxHeader map[string]string, paxKeyword string, s string) {
-- needsPaxHeader := len(s) > len(b) || !isASCII7Bit(s)
-- if needsPaxHeader {
-- paxHeader[paxKeyword] = s
-- return
-- }
-- copy(b, stripTo7BitsAndShorten(s, len(b)))
-- if len(s) < len(b) {
-- b[len(s)] = 0
+- ascii := toASCII(s)
+- copy(b, ascii)
+- if len(ascii) < len(b) {
+- b[len(ascii)] = 0
- }
-}
-
@@ -74472,17 +76221,27 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- for len(s)+1 < len(b) {
- s = "0" + s
- }
-- tw.cString(b, s)
+- tw.cString(b, s, false, paxNone, nil)
-}
-
-// Write x into b, either as octal or as binary (GNUtar/star extension).
--func (tw *Writer) numeric(b []byte, x int64) {
+-// If the value is too long for the field and writingPax is enabled both for the field and the add a paxheader record instead
+-func (tw *Writer) numeric(b []byte, x int64, allowPax bool, paxKeyword string, paxHeaders map[string]string) {
- // Try octal first.
- s := strconv.FormatInt(x, 8)
- if len(s) < len(b) {
- tw.octal(b, x)
- return
- }
+-
+- // If it is too long for octal, and pax is preferred, use a pax header
+- if allowPax && tw.preferPax {
+- tw.octal(b, 0)
+- s := strconv.FormatInt(x, 10)
+- paxHeaders[paxKeyword] = s
+- return
+- }
+-
- // Too big: use binary (big-endian).
- tw.usedBinary = true
- for i := len(b) - 1; x > 0 && i >= 0; i-- {
@@ -74492,28 +76251,6 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- b[0] |= 0x80 // highest bit indicates binary format
-}
-
--// Write x into b, if it is smaller than 2097151. If the value is too long for the field add a paxheader record instead
--func (tw *Writer) fillNumericHeaderField(b []byte, paxHeader map[string]string, paxKeyword string, x int64) {
-- if tw.preferPax && x > 2097151 {
-- s := strconv.FormatInt(x, 10)
-- paxHeader[paxKeyword] = s
-- tw.numeric(b, 0)
-- } else {
-- tw.numeric(b, x)
-- }
--}
--
--// Write x into b, if it is smaller than 2097151. If the value is too long for the field add a paxheader record instead
--func (tw *Writer) fillNumericLongHeaderField(b []byte, paxHeader map[string]string, paxKeyword string, x int64) {
-- if tw.preferPax && x > 8589934591 {
-- s := strconv.FormatInt(x, 10)
-- paxHeader[paxKeyword] = s
-- tw.numeric(b, 0)
-- } else {
-- tw.numeric(b, x)
-- }
--}
--
-var (
- minTime = time.Unix(0, 0)
- // There is room for 11 octal digits (33 bits) of mtime.
@@ -74530,7 +76267,7 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
-// WriteHeader writes hdr and prepares to accept the file's contents.
-// WriteHeader calls Flush if it is not the first header.
-// Calling after a Close will return ErrWriteAfterClose.
--// As this method is called internally by writePax header it allows to
+-// As this method is called internally by writePax header to allow it to
-// suppress writing the pax header.
-func (tw *Writer) writeHeader(hdr *Header, allowPax bool) error {
- if tw.closed {
@@ -74544,7 +76281,7 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- }
-
- // a map to hold pax header records, if any are needed
-- paxHeaderRecords := make(map[string]string)
+- paxHeaders := make(map[string]string)
-
- // TODO(shanemhansen): we might want to use PAX headers for
- // subsecond time resolution, but for now let's just capture
@@ -74556,7 +76293,7 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- // keep a reference to the filename to allow to overwrite it later if we detect that we can use ustar longnames instead of pax
- pathHeaderBytes := s.next(fileNameSize)
-
-- tw.fillHeaderField(pathHeaderBytes, paxHeaderRecords, PAX_PATH, hdr.Name)
+- tw.cString(pathHeaderBytes, hdr.Name, true, paxPath, paxHeaders)
-
- // Handle out of range ModTime carefully.
- var modTime int64
@@ -74564,48 +76301,48 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- modTime = hdr.ModTime.Unix()
- }
-
-- tw.octal(s.next(8), hdr.Mode) // 100:108
-- tw.fillNumericHeaderField(s.next(8), paxHeaderRecords, PAX_UID, int64(hdr.Uid)) // 108:116
-- tw.fillNumericHeaderField(s.next(8), paxHeaderRecords, PAX_GID, int64(hdr.Gid)) // 116:124
-- tw.fillNumericLongHeaderField(s.next(12), paxHeaderRecords, PAX_SIZE, hdr.Size) // 124:136
-- tw.numeric(s.next(12), modTime) // 136:148 --- consider using pax for finer granularity
-- s.next(8) // chksum (148:156)
-- s.next(1)[0] = hdr.Typeflag // 156:157
+- tw.octal(s.next(8), hdr.Mode) // 100:108
+- tw.numeric(s.next(8), int64(hdr.Uid), true, paxUid, paxHeaders) // 108:116
+- tw.numeric(s.next(8), int64(hdr.Gid), true, paxGid, paxHeaders) // 116:124
+- tw.numeric(s.next(12), hdr.Size, true, paxSize, paxHeaders) // 124:136
+- tw.numeric(s.next(12), modTime, false, paxNone, nil) // 136:148 --- consider using pax for finer granularity
+- s.next(8) // chksum (148:156)
+- s.next(1)[0] = hdr.Typeflag // 156:157
-
-- tw.fillHeaderField(s.next(100), paxHeaderRecords, PAX_LINKPATH, hdr.Linkname)
+- tw.cString(s.next(100), hdr.Linkname, true, paxLinkpath, paxHeaders)
-
-- copy(s.next(8), []byte("ustar\x0000")) // 257:265
-- tw.fillHeaderField(s.next(32), paxHeaderRecords, PAX_UNAME, hdr.Uname) // 265:297
-- tw.fillHeaderField(s.next(32), paxHeaderRecords, PAX_GNAME, hdr.Gname) // 297:329
-- tw.numeric(s.next(8), hdr.Devmajor) // 329:337
-- tw.numeric(s.next(8), hdr.Devminor) // 337:345
+- copy(s.next(8), []byte("ustar\x0000")) // 257:265
+- tw.cString(s.next(32), hdr.Uname, true, paxUname, paxHeaders) // 265:297
+- tw.cString(s.next(32), hdr.Gname, true, paxGname, paxHeaders) // 297:329
+- tw.numeric(s.next(8), hdr.Devmajor, false, paxNone, nil) // 329:337
+- tw.numeric(s.next(8), hdr.Devminor, false, paxNone, nil) // 337:345
-
- // keep a reference to the prefix to allow to overwrite it later if we detect that we can use ustar longnames instead of pax
- prefixHeaderBytes := s.next(155)
-- tw.cString(prefixHeaderBytes, "") // 345:500 prefix
+- tw.cString(prefixHeaderBytes, "", false, paxNone, nil) // 345:500 prefix
-
- // Use the GNU magic instead of POSIX magic if we used any GNU extensions.
- if tw.usedBinary {
- copy(header[257:265], []byte("ustar \x00"))
- }
-
-- _, paxPathUsed := paxHeaderRecords[PAX_PATH]
+- _, paxPathUsed := paxHeaders[paxPath]
- // try to use a ustar header when only the name is too long
-- if !tw.preferPax && len(paxHeaderRecords) == 1 && paxPathUsed {
+- if !tw.preferPax && len(paxHeaders) == 1 && paxPathUsed {
- suffix := hdr.Name
- prefix := ""
-- if len(hdr.Name) > fileNameSize && isASCII7Bit(hdr.Name) {
+- if len(hdr.Name) > fileNameSize && isASCII(hdr.Name) {
- var err error
- prefix, suffix, err = tw.splitUSTARLongName(hdr.Name)
- if err == nil {
- // ok we can use a ustar long name instead of pax, now correct the fields
-
- // remove the path field from the pax header. this will suppress the pax header
-- delete(paxHeaderRecords, PAX_PATH)
+- delete(paxHeaders, paxPath)
-
- // update the path fields
-- tw.cString(pathHeaderBytes, suffix)
-- tw.cString(prefixHeaderBytes, prefix)
+- tw.cString(pathHeaderBytes, suffix, false, paxNone, nil)
+- tw.cString(prefixHeaderBytes, prefix, false, paxNone, nil)
-
- // Use the ustar magic if we used ustar long names.
- if len(prefix) > 0 {
@@ -74626,17 +76363,16 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- return tw.err
- }
-
-- if len(paxHeaderRecords) > 0 {
-- if allowPax {
-- if err := tw.writePAXHeader(hdr, paxHeaderRecords); err != nil {
-- return err
-- }
-- } else {
-- return errFieldTooLongNoAscii
+- if len(paxHeaders) > 0 {
+- if !allowPax {
+- return errInvalidHeader
+- }
+- if err := tw.writePAXHeader(hdr, paxHeaders); err != nil {
+- return err
- }
- }
- tw.nb = int64(hdr.Size)
-- tw.pad = -tw.nb & (blockSize - 1) // blockSize is a power of two
+- tw.pad = (blockSize - (tw.nb % blockSize)) % blockSize
-
- _, tw.err = tw.w.Write(header)
- return tw.err
@@ -74654,8 +76390,11 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- length--
- }
- i := strings.LastIndex(name[:length], "/")
-- nlen := length - i - 1
-- if i <= 0 || nlen > fileNameSize || nlen == 0 {
+- // nlen contains the resulting length in the name field.
+- // plen contains the resulting length in the prefix field.
+- nlen := len(name) - i - 1
+- plen := i
+- if i <= 0 || nlen > fileNameSize || nlen == 0 || plen > fileNamePrefixSize {
- err = errNameTooLong
- return
- }
@@ -74665,7 +76404,7 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
-
-// writePaxHeader writes an extended pax header to the
-// archive.
--func (tw *Writer) writePAXHeader(hdr *Header, paxHeaderRecords map[string]string) error {
+-func (tw *Writer) writePAXHeader(hdr *Header, paxHeaders map[string]string) error {
- // Prepare extended header
- ext := new(Header)
- ext.Typeflag = TypeXHeader
@@ -74679,12 +76418,16 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- fullName := path.Join(dir,
- fmt.Sprintf("PaxHeaders.%d", pid), file)
-
-- ext.Name = stripTo7BitsAndShorten(fullName, 100)
+- ascii := toASCII(fullName)
+- if len(ascii) > 100 {
+- ascii = ascii[:100]
+- }
+- ext.Name = ascii
- // Construct the body
- var buf bytes.Buffer
-
-- for k, v := range paxHeaderRecords {
-- fmt.Fprint(&buf, paxHeader(k, v))
+- for k, v := range paxHeaders {
+- fmt.Fprint(&buf, paxHeader(k+"="+v))
- }
-
- ext.Size = int64(len(buf.Bytes()))
@@ -74701,17 +76444,16 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
-}
-
-// paxHeader formats a single pax record, prefixing it with the appropriate length
--func paxHeader(keyword string, value string) string {
--
-- const padding = 3 // Extra padding for space and newline
-- size := len(keyword) + len(value) + padding
+-func paxHeader(msg string) string {
+- const padding = 2 // Extra padding for space and newline
+- size := len(msg) + padding
- size += len(strconv.Itoa(size))
-- record := fmt.Sprintf("%d %s=%s\n", size, keyword, value)
+- record := fmt.Sprintf("%d %s\n", size, msg)
- if len(record) != size {
- // Final adjustment if adding size increased
- // the number of digits in size
- size = len(record)
-- record = fmt.Sprintf("%d %s=%s\n", size, keyword, value)
+- record = fmt.Sprintf("%d %s\n", size, msg)
- }
- return record
-}
@@ -74760,10 +76502,10 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer.go docker-devma
- }
- return tw.err
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer_test.go docker-devmapper/vendor/src/github.com/dotcloud/tar/writer_test.go
---- docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/dotcloud/tar/writer_test.go 1969-12-31 18:00:00.000000000 -0600
-@@ -1,357 +0,0 @@
+diff -uNr docker-0.6.3/vendor/src/github.com/dotcloud/tar/writer_test.go docker/vendor/src/github.com/dotcloud/tar/writer_test.go
+--- docker-0.6.3/vendor/src/github.com/dotcloud/tar/writer_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/dotcloud/tar/writer_test.go 1969-12-31 18:00:00.000000000 -0600
+@@ -1,393 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
@@ -75107,23 +76849,59 @@ diff -uNr docker-0.6.2/vendor/src/github.com/dotcloud/tar/writer_test.go docker-
-func TestPAXHeader(t *testing.T) {
- medName := strings.Repeat("CD", 50)
- longName := strings.Repeat("AB", 100)
-- paxTests := [][3]string{
-- {PAX_PATH, "/etc/hosts", "19 path=/etc/hosts\n"},
-- {"a", "b", "6 a=b\n"}, // Single digit length
-- {"a", "names", "11 a=names\n"}, // Test case involving carries
-- {PAX_PATH, longName, fmt.Sprintf("210 path=%s\n", longName)},
-- {PAX_PATH, medName, fmt.Sprintf("110 path=%s\n", medName)}}
+- paxTests := [][2]string{
+- {paxPath + "=/etc/hosts", "19 path=/etc/hosts\n"},
+- {"a=b", "6 a=b\n"}, // Single digit length
+- {"a=names", "11 a=names\n"}, // Test case involving carries
+- {paxPath + "=" + longName, fmt.Sprintf("210 path=%s\n", longName)},
+- {paxPath + "=" + medName, fmt.Sprintf("110 path=%s\n", medName)}}
-
- for _, test := range paxTests {
-- field, key, expected := test[0], test[1], test[2]
-- if result := paxHeader(field, key); result != expected {
+- key, expected := test[0], test[1]
+- if result := paxHeader(key); result != expected {
- t.Fatalf("paxHeader: got %s, expected %s", result, expected)
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/context.go docker-devmapper/vendor/src/github.com/gorilla/context/context.go
---- docker-0.6.2/vendor/src/github.com/gorilla/context/context.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/context/context.go 1969-12-31 18:00:00.000000000 -0600
+-
+-func TestUSTARLongName(t *testing.T) {
+- // Create an archive with a path that failed to split with USTAR extension in previous versions.
+- fileinfo, err := os.Stat("testdata/small.txt")
+- if err != nil {
+- t.Fatal(err)
+- }
+- hdr, err := FileInfoHeader(fileinfo, "")
+- hdr.Typeflag = TypeDir
+- if err != nil {
+- t.Fatalf("os.Stat:1 %v", err)
+- }
+- // Force a PAX long name to be written. The name was taken from a practical example
+- // that fails and replaced ever char through numbers to anonymize the sample.
+- longName := "/0000_0000000/00000-000000000/0000_0000000/00000-0000000000000/0000_0000000/00000-0000000-00000000/0000_0000000/00000000/0000_0000000/000/0000_0000000/00000000v00/0000_0000000/000000/0000_0000000/0000000/0000_0000000/00000y-00/0000/0000/00000000/0x000000/"
+- hdr.Name = longName
+-
+- hdr.Size = 0
+- var buf bytes.Buffer
+- writer := NewWriter(&buf)
+- if err := writer.WriteHeader(hdr); err != nil {
+- t.Fatal(err)
+- }
+- if err := writer.Close(); err != nil {
+- t.Fatal(err)
+- }
+- // Test that we can get a long name back out of the archive.
+- reader := NewReader(&buf)
+- hdr, err = reader.Next()
+- if err != nil {
+- t.Fatal(err)
+- }
+- if hdr.Name != longName {
+- t.Fatal("Couldn't recover long name")
+- }
+-}
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/context/context.go docker/vendor/src/github.com/gorilla/context/context.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/context/context.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/context/context.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,112 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -75237,9 +77015,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/context.go docker-d
- h.ServeHTTP(w, r)
- })
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/context_test.go docker-devmapper/vendor/src/github.com/gorilla/context/context_test.go
---- docker-0.6.2/vendor/src/github.com/gorilla/context/context_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/context/context_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/context/context_test.go docker/vendor/src/github.com/gorilla/context/context_test.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/context/context_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/context/context_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,66 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -75307,9 +77085,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/context_test.go doc
- Clear(r)
- assertEqual(len(data), 0)
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/doc.go docker-devmapper/vendor/src/github.com/gorilla/context/doc.go
---- docker-0.6.2/vendor/src/github.com/gorilla/context/doc.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/context/doc.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/context/doc.go docker/vendor/src/github.com/gorilla/context/doc.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/context/doc.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/context/doc.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,82 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -75393,9 +77171,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/doc.go docker-devma
-so if you are using either of them you don't need to clear the context manually.
-*/
-package context
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/LICENSE docker-devmapper/vendor/src/github.com/gorilla/context/LICENSE
---- docker-0.6.2/vendor/src/github.com/gorilla/context/LICENSE 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/context/LICENSE 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/context/LICENSE docker/vendor/src/github.com/gorilla/context/LICENSE
+--- docker-0.6.3/vendor/src/github.com/gorilla/context/LICENSE 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/context/LICENSE 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
@@ -75424,9 +77202,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/LICENSE docker-devm
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/README.md docker-devmapper/vendor/src/github.com/gorilla/context/README.md
---- docker-0.6.2/vendor/src/github.com/gorilla/context/README.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/context/README.md 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/context/README.md docker/vendor/src/github.com/gorilla/context/README.md
+--- docker-0.6.3/vendor/src/github.com/gorilla/context/README.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/context/README.md 1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-context
-=======
@@ -75434,9 +77212,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/context/README.md docker-de
-gorilla/context is a general purpose registry for global request variables.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/context
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/bench_test.go docker-devmapper/vendor/src/github.com/gorilla/mux/bench_test.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/bench_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/bench_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/bench_test.go docker/vendor/src/github.com/gorilla/mux/bench_test.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/bench_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/bench_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,21 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -75459,9 +77237,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/bench_test.go docker-de
- router.ServeHTTP(nil, request)
- }
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/doc.go docker-devmapper/vendor/src/github.com/gorilla/mux/doc.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/doc.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/doc.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/doc.go docker/vendor/src/github.com/gorilla/mux/doc.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/doc.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/doc.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,199 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -75662,9 +77440,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/doc.go docker-devmapper
- "id", "42")
-*/
-package mux
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/LICENSE docker-devmapper/vendor/src/github.com/gorilla/mux/LICENSE
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/LICENSE 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/LICENSE 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/LICENSE docker/vendor/src/github.com/gorilla/mux/LICENSE
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/LICENSE 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/LICENSE 1969-12-31 18:00:00.000000000 -0600
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
@@ -75693,9 +77471,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/LICENSE docker-devmappe
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/mux.go docker-devmapper/vendor/src/github.com/gorilla/mux/mux.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/mux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/mux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/mux.go docker/vendor/src/github.com/gorilla/mux/mux.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/mux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/mux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,335 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -76032,9 +77810,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/mux.go docker-devmapper
- }
- return true
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/mux_test.go docker-devmapper/vendor/src/github.com/gorilla/mux/mux_test.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/mux_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/mux_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/mux_test.go docker/vendor/src/github.com/gorilla/mux/mux_test.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/mux_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/mux_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,723 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -76759,9 +78537,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/mux_test.go docker-devm
- }
- return req
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/old_test.go docker-devmapper/vendor/src/github.com/gorilla/mux/old_test.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/old_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/old_test.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/old_test.go docker/vendor/src/github.com/gorilla/mux/old_test.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/old_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/old_test.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,758 +0,0 @@
-// Old tests ported to Go1. This is a mess. Want to drop it one day.
-
@@ -77521,9 +79299,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/old_test.go docker-devm
- }
- }
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/README.md docker-devmapper/vendor/src/github.com/gorilla/mux/README.md
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/README.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/README.md 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/README.md docker/vendor/src/github.com/gorilla/mux/README.md
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/README.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/README.md 1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-mux
-===
@@ -77531,9 +79309,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/README.md docker-devmap
-gorilla/mux is a powerful URL router and dispatcher.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/mux
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/regexp.go docker-devmapper/vendor/src/github.com/gorilla/mux/regexp.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/regexp.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/regexp.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/regexp.go docker/vendor/src/github.com/gorilla/mux/regexp.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/regexp.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/regexp.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,247 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -77782,9 +79560,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/regexp.go docker-devmap
- }
- return r.URL.Host
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/route.go docker-devmapper/vendor/src/github.com/gorilla/mux/route.go
---- docker-0.6.2/vendor/src/github.com/gorilla/mux/route.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/gorilla/mux/route.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/gorilla/mux/route.go docker/vendor/src/github.com/gorilla/mux/route.go
+--- docker-0.6.3/vendor/src/github.com/gorilla/mux/route.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/gorilla/mux/route.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,499 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
@@ -78285,9 +80063,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/gorilla/mux/route.go docker-devmapp
- }
- return r.regexp
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/doc.go docker-devmapper/vendor/src/github.com/kr/pty/doc.go
---- docker-0.6.2/vendor/src/github.com/kr/pty/doc.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/doc.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/doc.go docker/vendor/src/github.com/kr/pty/doc.go
+--- docker-0.6.3/vendor/src/github.com/kr/pty/doc.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/doc.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
-// Package pty provides functions for working with Unix terminals.
-package pty
@@ -78300,17 +80078,17 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/doc.go docker-devmapper/vend
-func Open() (pty, tty *os.File, err error) {
- return open()
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/.gitignore docker-devmapper/vendor/src/github.com/kr/pty/.gitignore
---- docker-0.6.2/vendor/src/github.com/kr/pty/.gitignore 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/.gitignore 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/.gitignore docker/vendor/src/github.com/kr/pty/.gitignore
+--- docker-0.6.3/vendor/src/github.com/kr/pty/.gitignore 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/.gitignore 1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-[568].out
-_go*
-_test*
-_obj
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/License docker-devmapper/vendor/src/github.com/kr/pty/License
---- docker-0.6.2/vendor/src/github.com/kr/pty/License 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/License 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/License docker/vendor/src/github.com/kr/pty/License
+--- docker-0.6.3/vendor/src/github.com/kr/pty/License 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/License 1969-12-31 18:00:00.000000000 -0600
@@ -1,23 +0,0 @@
-Copyright (c) 2011 Keith Rarick
-
@@ -78335,9 +80113,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/License docker-devmapper/ven
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/pty_darwin.go docker-devmapper/vendor/src/github.com/kr/pty/pty_darwin.go
---- docker-0.6.2/vendor/src/github.com/kr/pty/pty_darwin.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/pty_darwin.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/pty_darwin.go docker/vendor/src/github.com/kr/pty/pty_darwin.go
+--- docker-0.6.3/vendor/src/github.com/kr/pty/pty_darwin.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/pty_darwin.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,69 +0,0 @@
-package pty
-
@@ -78408,9 +80186,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/pty_darwin.go docker-devmapp
- }
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/pty_linux.go docker-devmapper/vendor/src/github.com/kr/pty/pty_linux.go
---- docker-0.6.2/vendor/src/github.com/kr/pty/pty_linux.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/pty_linux.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/pty_linux.go docker/vendor/src/github.com/kr/pty/pty_linux.go
+--- docker-0.6.3/vendor/src/github.com/kr/pty/pty_linux.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/pty_linux.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,63 +0,0 @@
-package pty
-
@@ -78475,9 +80253,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/pty_linux.go docker-devmappe
- }
- return nil
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/README.md docker-devmapper/vendor/src/github.com/kr/pty/README.md
---- docker-0.6.2/vendor/src/github.com/kr/pty/README.md 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/README.md 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/README.md docker/vendor/src/github.com/kr/pty/README.md
+--- docker-0.6.3/vendor/src/github.com/kr/pty/README.md 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/README.md 1969-12-31 18:00:00.000000000 -0600
@@ -1,36 +0,0 @@
-# pty
-
@@ -78515,9 +80293,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/README.md docker-devmapper/v
- io.Copy(os.Stdout, f)
-}
-```
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/run.go docker-devmapper/vendor/src/github.com/kr/pty/run.go
---- docker-0.6.2/vendor/src/github.com/kr/pty/run.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/run.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/run.go docker/vendor/src/github.com/kr/pty/run.go
+--- docker-0.6.3/vendor/src/github.com/kr/pty/run.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/run.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,28 +0,0 @@
-package pty
-
@@ -78547,9 +80325,9 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/run.go docker-devmapper/vend
- }
- return pty, err
-}
-diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/util.go docker-devmapper/vendor/src/github.com/kr/pty/util.go
---- docker-0.6.2/vendor/src/github.com/kr/pty/util.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/vendor/src/github.com/kr/pty/util.go 1969-12-31 18:00:00.000000000 -0600
+diff -uNr docker-0.6.3/vendor/src/github.com/kr/pty/util.go docker/vendor/src/github.com/kr/pty/util.go
+--- docker-0.6.3/vendor/src/github.com/kr/pty/util.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/vendor/src/github.com/kr/pty/util.go 1969-12-31 18:00:00.000000000 -0600
@@ -1,35 +0,0 @@
-package pty
-
@@ -78586,15 +80364,15 @@ diff -uNr docker-0.6.2/vendor/src/github.com/kr/pty/util.go docker-devmapper/ven
- }
- return nil
-}
-diff -uNr docker-0.6.2/VERSION docker-devmapper/VERSION
---- docker-0.6.2/VERSION 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/VERSION 2013-09-23 10:37:39.632304302 -0500
+diff -uNr docker-0.6.3/VERSION docker/VERSION
+--- docker-0.6.3/VERSION 2013-09-23 13:29:11.000000000 -0500
++++ docker/VERSION 2013-09-26 14:37:02.922991354 -0500
@@ -1 +1 @@
--0.6.2
+-0.6.3
+0.6.1-dev
-diff -uNr docker-0.6.2/z_final_test.go docker-devmapper/z_final_test.go
---- docker-0.6.2/z_final_test.go 2013-09-17 13:11:39.000000000 -0500
-+++ docker-devmapper/z_final_test.go 2013-09-23 10:37:39.601304388 -0500
+diff -uNr docker-0.6.3/z_final_test.go docker/z_final_test.go
+--- docker-0.6.3/z_final_test.go 2013-09-23 13:29:11.000000000 -0500
++++ docker/z_final_test.go 2013-09-26 14:37:16.159935655 -0500
@@ -11,7 +11,7 @@
}
diff --git a/docker-0.6.3-remove-dotcloud-tar.patch b/docker-0.6.3-remove-dotcloud-tar.patch
new file mode 100644
index 0000000..fa22915
--- /dev/null
+++ b/docker-0.6.3-remove-dotcloud-tar.patch
@@ -0,0 +1,12 @@
+diff -uNr docker-0.6.3/utils/tarsum.go docker-0.6.3-1/utils/tarsum.go
+--- docker-0.6.3/utils/tarsum.go 2013-09-23 13:29:11.000000000 -0500
++++ docker-0.6.3-1/utils/tarsum.go 2013-09-26 14:43:04.329473915 -0500
+@@ -5,7 +5,7 @@
+ "compress/gzip"
+ "crypto/sha256"
+ "encoding/hex"
+- "github.com/dotcloud/tar"
++ "archive/tar"
+ "hash"
+ "io"
+ "sort"
diff --git a/docker-io.spec b/docker-io.spec
index f6f1ea6..2c34814 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -3,8 +3,8 @@
%global gopath %{_datadir}/gocode
Name: docker-io
-Version: 0.6.2
-Release: 14.devicemapper%{?dist}
+Version: 0.6.3
+Release: 1.devicemapper%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -93,6 +93,10 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Thu Sep 26 2013 Lokesh Mandvekar <lsm5 at redhat.com> 0.6.3-1.devicemapper
+- version bump
+- new version solves docker push issues
+
* Tue Sep 24 2013 Lokesh Mandvekar <lsm5 at redhat.com> 0.6.2-14.devicemapper
- package requires lxc
diff --git a/sources b/sources
index 6d1e6f6..88e286b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41df68b4b4f1e03ab1d0964f4b73f440 v0.6.2.tar.gz
+7926f24106b4299ffbb669d42fd7e375 v0.6.3.tar.gz
More information about the scm-commits
mailing list