From dcc4a14ba31ab195f97dcf264835339a1a00e8d5 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Mon, 15 Jun 2015 11:38:06 -0700 Subject: [PATCH] Picking up missed out vendor files via hack/vendor.sh while wokring on another PR, I noticed that hack/vendor.sh was picking up unrelated files. Maybe a previous update to the hack/vendor.sh failed to run the script and push the vendor changes ? Signed-off-by: Madhu Venugopal --- vendor/src/github.com/Sirupsen/logrus/README.md | 2 +- vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md | 6 +++--- vendor/src/github.com/docker/libcontainer/ROADMAP.md | 2 +- vendor/src/github.com/docker/libcontainer/SPEC.md | 2 +- vendor/src/github.com/docker/libcontainer/console_linux.go | 2 +- vendor/src/github.com/docker/libcontainer/nsenter/README.md | 2 +- vendor/src/github.com/docker/libtrust/util.go | 2 +- vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md | 2 +- vendor/src/github.com/mistifyio/go-zfs/README.md | 2 +- vendor/src/github.com/vishvananda/netlink/README.md | 2 +- vendor/src/github.com/vishvananda/netns/README.md | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vendor/src/github.com/Sirupsen/logrus/README.md b/vendor/src/github.com/Sirupsen/logrus/README.md index 72e7a78288..3578deaec0 100644 --- a/vendor/src/github.com/Sirupsen/logrus/README.md +++ b/vendor/src/github.com/Sirupsen/logrus/README.md @@ -324,7 +324,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) { #### Logger as an `io.Writer` -Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it. +Logrus can be transormed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it. ```go w := logger.Writer() diff --git a/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md b/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md index c848f4dbcb..667cc5a63f 100644 --- a/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md +++ b/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md @@ -24,21 +24,21 @@ The following packages are required to compile libcontainer natively. - git - cgutils -You can develop on OS X, but you are limited to Dockerfile-based builds only. +You can develop on OSX, but you are limited to Dockerfile-based builds only. ### Building libcontainer from Dockerfile make all This is the easiest way of building libcontainer. -As this build is done using Docker, you can even run this from [OS X](https://github.com/boot2docker/boot2docker) +As this build is done using Docker, you can even run this from [OSX](https://github.com/boot2docker/boot2docker) ### Testing changes with "nsinit" make sh This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/docker/libcontainer/blob/master/sample_configs/minimal.json). -Like the previous command, you can run this on OS X too! +Like the previous command, you can run this on OSX too! ### Building libcontainer directly diff --git a/vendor/src/github.com/docker/libcontainer/ROADMAP.md b/vendor/src/github.com/docker/libcontainer/ROADMAP.md index 7412460ef8..f59035351a 100644 --- a/vendor/src/github.com/docker/libcontainer/ROADMAP.md +++ b/vendor/src/github.com/docker/libcontainer/ROADMAP.md @@ -3,7 +3,7 @@ This document is a high-level overview of where we want to take libcontainer next. It is a curated selection of planned improvements which are either important, difficult, or both. -For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/libcontainer/issues). +For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/libcontainer/issues). To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request. diff --git a/vendor/src/github.com/docker/libcontainer/SPEC.md b/vendor/src/github.com/docker/libcontainer/SPEC.md index 39ccd68eae..5d37fe935a 100644 --- a/vendor/src/github.com/docker/libcontainer/SPEC.md +++ b/vendor/src/github.com/docker/libcontainer/SPEC.md @@ -60,7 +60,7 @@ are required to be mounted within the rootfs that the runtime will setup. After a container's filesystems are mounted within the newly created mount namespace `/dev` will need to be populated with a set of device nodes. It is expected that a rootfs does not need to have any device nodes specified -for `/dev` within the rootfs as the container will setup the correct devices +for `/dev` witin the rootfs as the container will setup the correct devices that are required for executing a container's process. | Path | Mode | Access | diff --git a/vendor/src/github.com/docker/libcontainer/console_linux.go b/vendor/src/github.com/docker/libcontainer/console_linux.go index d5fec6fd6e..5eaf03169b 100644 --- a/vendor/src/github.com/docker/libcontainer/console_linux.go +++ b/vendor/src/github.com/docker/libcontainer/console_linux.go @@ -44,7 +44,7 @@ func newConsoleFromPath(slavePath string) *linuxConsole { } } -// linuxConsole is a linux pseudo TTY for use within a container. +// linuxConsole is a linux psuedo TTY for use within a container. type linuxConsole struct { master *os.File slavePath string diff --git a/vendor/src/github.com/docker/libcontainer/nsenter/README.md b/vendor/src/github.com/docker/libcontainer/nsenter/README.md index 7da6dbe9a2..d1a60ef985 100644 --- a/vendor/src/github.com/docker/libcontainer/nsenter/README.md +++ b/vendor/src/github.com/docker/libcontainer/nsenter/README.md @@ -18,7 +18,7 @@ which will give the process of the container that should be joined. Namespaces f be found from `/proc/[pid]/ns` and set by `setns` syscall. And then get the pipe number from `_LIBCONTAINER_INITPIPE`, error message could -be transferred through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will +be transfered through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will have value and start a console for output. Finally, `nsexec()` will clone a child process , exit the parent process and let diff --git a/vendor/src/github.com/docker/libtrust/util.go b/vendor/src/github.com/docker/libtrust/util.go index 153f7b462c..4d5a6200a8 100644 --- a/vendor/src/github.com/docker/libtrust/util.go +++ b/vendor/src/github.com/docker/libtrust/util.go @@ -16,7 +16,7 @@ import ( ) // joseBase64UrlEncode encodes the given data using the standard base64 url -// encoding format but with all trailing '=' characters omitted in accordance +// encoding format but with all trailing '=' characters ommitted in accordance // with the jose specification. // http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2 func joseBase64UrlEncode(b []byte) string { diff --git a/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md b/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md index 849323a5f1..f1880c19e5 100644 --- a/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md +++ b/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md @@ -4,7 +4,7 @@ We always welcome contributions to help make `go-zfs` better. Please take a mome ### Reporting issues ### -We use [GitHub issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests. +We use [Github issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests. If you find a bug: diff --git a/vendor/src/github.com/mistifyio/go-zfs/README.md b/vendor/src/github.com/mistifyio/go-zfs/README.md index fef80d727b..2515e588e0 100644 --- a/vendor/src/github.com/mistifyio/go-zfs/README.md +++ b/vendor/src/github.com/mistifyio/go-zfs/README.md @@ -29,7 +29,7 @@ The tests have decent examples for most functions. ```go //assuming a zpool named test -//error handling omitted +//error handling ommitted f, err := zfs.CreateFilesystem("test/snapshot-test", nil) diff --git a/vendor/src/github.com/vishvananda/netlink/README.md b/vendor/src/github.com/vishvananda/netlink/README.md index 734384cfcd..555f886523 100644 --- a/vendor/src/github.com/vishvananda/netlink/README.md +++ b/vendor/src/github.com/vishvananda/netlink/README.md @@ -8,7 +8,7 @@ the kernel. It can be used to add and remove interfaces, set ip addresses and routes, and configure ipsec. Netlink communication requires elevated privileges, so in most cases this code needs to be run as root. Since low-level netlink messages are inscrutable at best, the library attempts -to provide an api that is loosely modeled on the CLI provided by iproute2. +to provide an api that is loosely modeled on the CLI provied by iproute2. Actions like `ip link add` will be accomplished via a similarly named function like AddLink(). This library began its life as a fork of the netlink functionality in diff --git a/vendor/src/github.com/vishvananda/netns/README.md b/vendor/src/github.com/vishvananda/netns/README.md index 57d195f2c7..24a4003ae6 100644 --- a/vendor/src/github.com/vishvananda/netns/README.md +++ b/vendor/src/github.com/vishvananda/netns/README.md @@ -38,7 +38,7 @@ func main() { newns, _ := netns.New() defer newns.Close() - // Do something with the network namespace + // Do something with tne network namespace ifaces, _ := net.Interfaces() fmt.Printf("Interfaces: %v\n", ifaces)