|
 |
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/archive.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/archive.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/archive.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/archive.go 2014-06-05 19:38:04.963219406 -0400
|
|
|
b28b51 |
@@ -18,7 +18,7 @@
|
|
|
b28b51 |
|
|
|
b28b51 |
"github.com/dotcloud/docker/pkg/system"
|
|
|
b28b51 |
"github.com/dotcloud/docker/utils"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
)
|
|
|
b28b51 |
|
|
|
b28b51 |
type (
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/archive_test.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/archive_test.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/archive_test.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/archive_test.go 2014-06-05 19:37:59.555194220 -0400
|
|
|
b28b51 |
@@ -11,7 +11,7 @@
|
|
|
b28b51 |
"testing"
|
|
|
b28b51 |
"time"
|
|
|
b28b51 |
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
)
|
|
|
b28b51 |
|
|
|
b28b51 |
func TestCmdStreamLargeStderr(t *testing.T) {
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/changes.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/changes.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/changes.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/changes.go 2014-06-05 19:37:52.204159915 -0400
|
|
|
b28b51 |
@@ -12,7 +12,7 @@
|
|
|
b28b51 |
|
|
|
b28b51 |
"github.com/dotcloud/docker/pkg/system"
|
|
|
b28b51 |
"github.com/dotcloud/docker/utils"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
)
|
|
|
b28b51 |
|
|
|
b28b51 |
type ChangeType int
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/diff.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/diff.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/diff.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/diff.go 2014-06-05 19:37:46.082131408 -0400
|
|
|
b28b51 |
@@ -9,7 +9,7 @@
|
|
|
b28b51 |
"strings"
|
|
|
b28b51 |
"syscall"
|
|
|
b28b51 |
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
)
|
|
|
b28b51 |
|
|
|
b28b51 |
// Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/wrap.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/wrap.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/archive/wrap.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/archive/wrap.go 2014-06-05 19:38:11.126248130 -0400
|
|
|
b28b51 |
@@ -2,7 +2,7 @@
|
|
|
b28b51 |
|
|
|
b28b51 |
import (
|
|
|
b28b51 |
"bytes"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
"io/ioutil"
|
|
|
b28b51 |
)
|
|
|
b28b51 |
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/graph/tags_unit_test.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/graph/tags_unit_test.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/graph/tags_unit_test.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/graph/tags_unit_test.go 2014-06-05 19:38:18.400282065 -0400
|
|
|
b28b51 |
@@ -6,7 +6,7 @@
|
|
|
b28b51 |
_ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
|
|
|
b28b51 |
"github.com/dotcloud/docker/image"
|
|
|
b28b51 |
"github.com/dotcloud/docker/utils"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
"io"
|
|
|
b28b51 |
"os"
|
|
|
b28b51 |
"path"
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/integration/api_test.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/integration/api_test.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/integration/api_test.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/integration/api_test.go 2014-06-05 19:38:35.927363757 -0400
|
|
|
b28b51 |
@@ -21,7 +21,7 @@
|
|
|
b28b51 |
"github.com/dotcloud/docker/image"
|
|
|
b28b51 |
"github.com/dotcloud/docker/runconfig"
|
|
|
b28b51 |
"github.com/dotcloud/docker/utils"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
)
|
|
|
b28b51 |
|
|
|
b28b51 |
func TestGetEvents(t *testing.T) {
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/integration/utils_test.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/integration/utils_test.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/integration/utils_test.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/integration/utils_test.go 2014-06-05 19:38:28.829330804 -0400
|
|
|
b28b51 |
@@ -13,7 +13,7 @@
|
|
|
b28b51 |
"testing"
|
|
|
b28b51 |
"time"
|
|
|
b28b51 |
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
|
|
|
b28b51 |
"github.com/dotcloud/docker/builtins"
|
|
|
b28b51 |
"github.com/dotcloud/docker/daemon"
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/utils/tarsum.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/utils/tarsum.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/utils/tarsum.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/utils/tarsum.go 2014-06-05 19:38:51.793437630 -0400
|
|
|
b28b51 |
@@ -5,7 +5,7 @@
|
|
|
b28b51 |
"compress/gzip"
|
|
|
b28b51 |
"crypto/sha256"
|
|
|
b28b51 |
"encoding/hex"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
"hash"
|
|
|
b28b51 |
"io"
|
|
|
b28b51 |
"sort"
|
|
|
b28b51 |
diff -uNr docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/utils/tarsum_test.go docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/utils/tarsum_test.go
|
|
|
b28b51 |
--- docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c/utils/tarsum_test.go 2014-06-05 19:32:24.000000000 -0400
|
|
|
b28b51 |
+++ docker-83ccab0b6b9b07fd05f66f1cff565e1ed6a7497c-1/utils/tarsum_test.go 2014-06-05 19:38:43.581399426 -0400
|
|
|
b28b51 |
@@ -4,7 +4,7 @@
|
|
|
b28b51 |
"bytes"
|
|
|
b28b51 |
"crypto/rand"
|
|
|
b28b51 |
"fmt"
|
|
|
b28b51 |
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
|
|
|
b28b51 |
+ "archive/tar"
|
|
|
b28b51 |
"io"
|
|
|
b28b51 |
"io/ioutil"
|
|
|
b28b51 |
"os"
|