Squashed 'vendor/src/github.com/docker/libcontainer/' content from commit 8f74c29

git-subtree-dir: vendor/src/github.com/docker/libcontainer
git-subtree-split: 8f74c29bc59d7f0b4fc6cfd6fa59f01532be9f9f
Merge commit '54abddbe654107513f83201f00457206f64a6767' as 'vendor/src/github.com/docker/libcontainer'
Update netlink package location in libcontainer
Merge pull request #188 from ncdc/vendor-libcontainer

Merged by openshift-bot
Squashed 'vendor/src/github.com/fsouza/go-dockerclient/' changes from f0766f9..63b2aa7

63b2aa7 client: fix hijack behavior
1e7f677 client: skip version checking in unversioned client
9ed2f16 client: add docs for ApiVersion
b2b8d3e event: fix golint warning
7375299 misc: reorder imports
8e4ff79 client: remove some other comments
11ecfab container: fix test
dad2364 client: remove some comments
2c14527 Add support for multiple Docker API versions
9bfe329 container: add the RawTerminal logic again
a68a2c5 container: add Logs
2526fe4 authors: add Omeid Matten
a43aa01 client.go: Error handling.
05e0714 Merge branch 'master' of github.com:jefferai/go-dockerclient
ff4c387 authors: add Cheah Chu Yeow
c3a083a Merge pull request #108 from nitrous-io/events-unexpected-eof
5012957 An unexpected EOF error can occur when Docker is restarted.
3b6f84c Add NetworkMode -- note that for the moment it is not checking validity (but the Docker API will)
a774dfd Add DnsSearch/VolumesFrom to HostConfig object
6062c6b Merge branch 'dns-config-fix' of github.com:ActiveState/go-dockerclient
6b8c0f8 add godoc about the duplicate Dns fields
5069023 keep Dns in `Config` for older API versions
78210d3 authors: add Peter Jihoon Kim
1a432ba Container struct should contain HostConfig struct
dc20c6d adjust tests for moved Dns config
f067d61 Dns is passed with HostConfig
db97d2b event: fix year in copyright header
8304c84 client: use a WaitGroup instead of channel for waiting on goroutines
9d564d0 Merge branch 'in-out-done' of github.com:benmccann/go-dockerclient
4a75357 event: remove nil check from httputil.NewClientConn
4718a73 authors: add Simon Eskildsen
1ea53be container: add test for name set from options
a78abc6 container: include container name given by option
7943f23 event: use JSON decoder instead of raw connection
8a15304 event: don't iterate over listeners when there are none
92a204b event: move eventmonitor to client
992e6ab authors: add Summer Mousa
ab3d457 authors: add Skolos
dfc3b28 Removed 2 blank lines.
43b4630 Remove unnecessary omitempty
b446673 Added TagImage tests
f919e7b Added TagImage
e00d869 travis: put go 1.1.2 back
5645f35 authors: add Eric Anderson
a095961 Fix for when all listeners are unregistered and the channel is destroyed.
eb3faac Don't return from attach until in and out are done
59b9ae8 testing: waitContainer sleeping for a while to avoid issues with go 1.1.2

git-subtree-dir: vendor/src/github.com/fsouza/go-dockerclient
git-subtree-split: 63b2aa7ee6a250bddec7d6cb95340758ed75f0ae
Merge commit '67e742f4db9fe7e6a8fd36e90c2ae8d2ce2945c2' into update-dockerclient
Update integration tests for new go-dockerclient

Add /version expectations where appropriate