Browse code

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 <madhu@docker.com>

Madhu Venugopal authored on 2015/06/16 03:38:06
Showing 11 changed files
... ...
@@ -324,7 +324,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
324 324
 
325 325
 #### Logger as an `io.Writer`
326 326
 
327
-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.
327
+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.
328 328
 
329 329
 ```go
330 330
 w := logger.Writer()
... ...
@@ -24,21 +24,21 @@ The following packages are required to compile libcontainer natively.
24 24
 - git
25 25
 - cgutils
26 26
 
27
-You can develop on OS X, but you are limited to Dockerfile-based builds only.
27
+You can develop on OSX, but you are limited to Dockerfile-based builds only.
28 28
 
29 29
 ### Building libcontainer from Dockerfile
30 30
 
31 31
     make all
32 32
 
33 33
 This is the easiest way of building libcontainer.
34
-As this build is done using Docker, you can even run this from [OS X](https://github.com/boot2docker/boot2docker)
34
+As this build is done using Docker, you can even run this from [OSX](https://github.com/boot2docker/boot2docker)
35 35
 
36 36
 ### Testing changes with "nsinit"
37 37
 
38 38
     make sh
39 39
 
40 40
 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).
41
-Like the previous command, you can run this on OS X too!
41
+Like the previous command, you can run this on OSX too!
42 42
 
43 43
 ### Building libcontainer directly
44 44
 
... ...
@@ -3,7 +3,7 @@
3 3
 This document is a high-level overview of where we want to take libcontainer next.
4 4
 It is a curated selection of planned improvements which are either important, difficult, or both.
5 5
 
6
-For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/libcontainer/issues).
6
+For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/libcontainer/issues).
7 7
 
8 8
 To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request.
9 9
 
... ...
@@ -60,7 +60,7 @@ are required to be mounted within the rootfs that the runtime will setup.
60 60
 After a container's filesystems are mounted within the newly created 
61 61
 mount namespace `/dev` will need to be populated with a set of device nodes.
62 62
 It is expected that a rootfs does not need to have any device nodes specified
63
-for `/dev` within the rootfs as the container will setup the correct devices
63
+for `/dev` witin the rootfs as the container will setup the correct devices
64 64
 that are required for executing a container's process.
65 65
 
66 66
 |      Path    | Mode |   Access   |
... ...
@@ -44,7 +44,7 @@ func newConsoleFromPath(slavePath string) *linuxConsole {
44 44
 	}
45 45
 }
46 46
 
47
-// linuxConsole is a linux pseudo TTY for use within a container.
47
+// linuxConsole is a linux psuedo TTY for use within a container.
48 48
 type linuxConsole struct {
49 49
 	master    *os.File
50 50
 	slavePath string
... ...
@@ -18,7 +18,7 @@ which will give the process of the container that should be joined. Namespaces f
18 18
 be found from `/proc/[pid]/ns` and set by `setns` syscall.
19 19
 
20 20
 And then get the pipe number from `_LIBCONTAINER_INITPIPE`, error message could
21
-be transferred through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will 
21
+be transfered through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will 
22 22
 have value and start a console for output.
23 23
 
24 24
 Finally, `nsexec()` will clone a child process , exit the parent process and let 
... ...
@@ -16,7 +16,7 @@ import (
16 16
 )
17 17
 
18 18
 // joseBase64UrlEncode encodes the given data using the standard base64 url
19
-// encoding format but with all trailing '=' characters omitted in accordance
19
+// encoding format but with all trailing '=' characters ommitted in accordance
20 20
 // with the jose specification.
21 21
 // http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2
22 22
 func joseBase64UrlEncode(b []byte) string {
... ...
@@ -4,7 +4,7 @@ We always welcome contributions to help make `go-zfs` better. Please take a mome
4 4
 
5 5
 ### Reporting issues ###
6 6
 
7
-We use [GitHub issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests.
7
+We use [Github issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests.
8 8
 
9 9
 If you find a bug:
10 10
 
... ...
@@ -29,7 +29,7 @@ The tests have decent examples for most functions.
29 29
 
30 30
 ```go
31 31
 //assuming a zpool named test
32
-//error handling omitted
32
+//error handling ommitted
33 33
 
34 34
 
35 35
 f, err := zfs.CreateFilesystem("test/snapshot-test", nil)
... ...
@@ -8,7 +8,7 @@ the kernel. It can be used to add and remove interfaces, set ip addresses
8 8
 and routes, and configure ipsec. Netlink communication requires elevated
9 9
 privileges, so in most cases this code needs to be run as root. Since
10 10
 low-level netlink messages are inscrutable at best, the library attempts
11
-to provide an api that is loosely modeled on the CLI provided by iproute2.
11
+to provide an api that is loosely modeled on the CLI provied by iproute2.
12 12
 Actions like `ip link add` will be accomplished via a similarly named
13 13
 function like AddLink(). This library began its life as a fork of the
14 14
 netlink functionality in
... ...
@@ -38,7 +38,7 @@ func main() {
38 38
     newns, _ := netns.New()
39 39
     defer newns.Close()
40 40
 
41
-    // Do something with the network namespace
41
+    // Do something with tne network namespace
42 42
     ifaces, _ := net.Interfaces()
43 43
     fmt.Printf("Interfaces: %v\n", ifaces)
44 44