72996be1fe
try to modprobe bridge
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: b3867b889960604904a4afbab6450bb9528afe06
Component: engine
2015-04-15 07:19:37 -07:00
0d57506a8e
Merge pull request #12269 from kostickm/12251-remove-not-empty-check
...
Remove container name not empty check
Upstream-commit: 5395cdcae58d867070cb78873fd5f51b72a5cfef
Component: engine
2015-04-14 17:55:13 -04:00
d31258c144
Merge pull request #12379 from sharkone/patch-1
...
Remove sprious `fmt.Printf` from test
Upstream-commit: ee547234850b0601ae25d831fb6dba426ce1ea0f
Component: engine
2015-04-14 14:25:16 -07:00
ef2b1dddc8
Remove unnecessary fmt.Printf
...
Signed-off-by: Thomas Texier <sharkone@en-mousse.org >
Upstream-commit: 2ea1febd9aafd94985a2430c35243e539fa29f53
Component: engine
2015-04-14 20:55:32 +00:00
96ab4241b1
Merge pull request #12356 from jfrazelle/godeps-lolololololololololololol
...
change go tools to use certain commit
Upstream-commit: 1e6f7e4ee5f108fa9269c4ffa7094036f1555f1d
Component: engine
2015-04-14 16:18:49 -04:00
c444005c81
Merge pull request #12292 from cpuguy83/remove_commands_integration
...
Remove commands integration
Upstream-commit: 2f0f04e8fa32a7f8d02b4a9078537f52887d8ab7
Component: engine
2015-04-14 16:17:25 -04:00
61453daea9
Merge pull request #11999 from vbatts/vbatts-decide_storage
...
graphdriver: prefer prior driver state
Upstream-commit: 74f4a88305c032365ea2611503d4673bf0b0b880
Component: engine
2015-04-14 13:04:21 -07:00
6ad23f22d8
Merge pull request #12357 from draghuram/prdoc
...
Improve the git instructions to update a PR.
Upstream-commit: 62e8621095e07407e4989981660d5e742424a3bb
Component: engine
2015-04-14 15:46:10 -04:00
1adac1131b
remove integration/utils setRaw funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 63331abbcadee3528f3e03f96cff1ca6a506cc9e
Component: engine
2015-04-14 15:17:17 -04:00
bc0083cbde
Improve the git instructions to update a PR.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 18a8bcf0720b394e22e28b1389589f1ebbdc5cfc
Component: engine
2015-04-14 15:11:35 -04:00
023499d83c
Merge pull request #12282 from cpuguy83/remove_some_integration_tests
...
Move integration/server_test tests to integration-cli
Upstream-commit: 676bf4afa53a30dcf2f0598895942701c7d59448
Component: engine
2015-04-14 11:55:05 -07:00
78eb19684c
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 98f857772f3be0985ab87c4bc6bd91e80e122c53
Component: engine
2015-04-14 11:27:06 -07:00
d727dca8ee
Merge pull request #12375 from moxiegirl/12366-change-fix
...
Fixing changed pushed without edit
Upstream-commit: a3d871220cff6fd68b0494a1c1891a279f090ee7
Component: engine
2015-04-14 11:06:41 -07:00
eb09b49e6e
Merge pull request #12370 from buddhamagnet/11593-api-client-docs
...
add docs for DockerCli and NewDockerCli fixes #11593
Upstream-commit: 5be5749d544702c5da37c8ab448b417daf13e297
Component: engine
2015-04-14 11:00:19 -07:00
1ec6ea18ce
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com >
Upstream-commit: 69747b3c1e254d78619b2d66340f5d5172280d90
Component: engine
2015-04-14 18:33:11 +01:00
cc306353a4
Fixing changed pushed without edit
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 4dd4bd00aa8285b3fcfca78322d4d867c65f7a50
Component: engine
2015-04-14 10:25:07 -07:00
4f2dd32821
Merge pull request #12214 from ahmetalpbalkan/namesgenerator/localrand
...
names-generator: use local random instance
Upstream-commit: 040176f6e17d6c1cc2468377b57a8b61d101123c
Component: engine
2015-04-14 13:10:26 -04:00
61e32357e7
Merge pull request #12374 from kostickm/12343-fix-vet-warning-archive
...
Fix vet warning in archive.go
Upstream-commit: 7b29a88146466a104a0bccfea8f1e7338ed18cc2
Component: engine
2015-04-14 10:06:04 -07:00
7514159c45
Merge pull request #12366 from bboreham/12337-force-push
...
Add -f option and explanation to push after rebase
Upstream-commit: 3748def343b03c14bd61a206d1a23a2b134c05f4
Component: engine
2015-04-14 09:59:48 -07:00
fc80104d72
Merge pull request #12365 from HuKeping/list
...
Use local variable err instead of a outer one
Upstream-commit: 392fd243bc8c9762aa9e559a67f2410ae3820ee8
Component: engine
2015-04-14 12:49:15 -04:00
b2af7d3023
Merge pull request #12368 from ZJU-SEL/fix-memory-stats-doc
...
fix memory stats display document
Upstream-commit: 398220f5ff059adab49bd1ae7797bf4c71bb8786
Component: engine
2015-04-14 09:44:44 -07:00
e1cbc10ddf
Merge pull request #12363 from ahmetalpbalkan/integ-cli/use-sockRequest-statuscode
...
integ-cli: Use status code from sockRequest (fix #12335 )
Upstream-commit: 8f0b63925ebf71c8b6f755e3b2d35bcdc7c92205
Component: engine
2015-04-14 09:38:10 -07:00
1375a98c5e
change go tools to use certain commit
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 736824ccc134a90740c2ae95034b4c5c506594c7
Component: engine
2015-04-14 09:32:23 -07:00
325400d97c
Use local variable err instead of a outer one
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a0804e8e118510dc49e7e74273a323e99c097a3d
Component: engine
2015-04-15 00:29:53 +08:00
8b7d236741
Fix vet warning in archive.go
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: fc20658a01e362a5bb484b439a0a1004c51f9ff5
Component: engine
2015-04-14 09:13:50 -07:00
07f1e1bf7b
Merge pull request #11992 from runcom/11923-refactor-utils-utils
...
Refactor utils/utils, fixes #11923
Upstream-commit: fe53c277857ba77caf9189b1d6d095835c1b792c
Component: engine
2015-04-14 12:01:23 -04:00
c1570d1a97
Merge pull request #11980 from sunyuan3/TestSearchCmdOptions
...
add TestSearchCmdOptions case
Upstream-commit: 5019f35111cb7253f4cf94e48193dc757d81d6aa
Component: engine
2015-04-14 08:34:40 -07:00
01cea82b52
fix memory stats display document
...
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Upstream-commit: d791f7e9f81010299130ae8816ebe58667ea6b09
Component: engine
2015-04-14 18:34:20 +08:00
981c7e3504
Add -f option and explanation to push after rebase
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: c89ddb6d015692e38a9b1a3223c406ddb5409758
Component: engine
2015-04-14 10:53:37 +01:00
491bf980ce
integ-cli: Use status code from sockRequest ( fix #12335 )
...
sockRequest now makes the status code available in the returned
values. This helps avoid string checking for non-HttpStatusOK(=200)
yet successful error messages.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 531433e7650c5d33ff6580d7de28a093a504ac6c
Component: engine
2015-04-14 08:07:50 +00:00
e458801862
names-generator: use local random instance
...
Instead of seeding/polluting the global random instance,
creating a local `rand.Random` instance which provides the same
level of randomness.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 25fab69f7dcf72dabfeb60f61f50f175692f0b03
Component: engine
2015-04-14 02:35:16 +00:00
78acc699c1
graphdriver: prefer prior driver state
...
Before this, a storage driver would be defaulted to based on the
priority list, and only print a warning if there is state from other
drivers.
This meant a reordering of priority list would "break" users in an
upgrade of docker, such that there images in the prior driver's state
were now invisible.
With this change, prior state is scanned, and if present that driver is
preferred.
As such, we can reorder the priority list, and after an upgrade,
existing installs with prior drivers can have a contiguous experience,
while fresh installs may default to a driver in the new priority list.
Ref: https://github.com/docker/docker/pull/11962#issuecomment-88274858
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: b68e161e5b76b5f622cf4fc226df46cbe314ea1e
Component: engine
2015-04-13 21:37:55 -04:00
53daac3bca
add TestSearchCmdOptions case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 77f2a4a0e373225c145966c96d076d6d9f25b3b3
Component: engine
2015-04-14 09:23:26 +08:00
fc9842cd3d
Merge pull request #12353 from sunyuan3/duplicate
...
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
Upstream-commit: 00eddf5e6718bca6fd011014d0acfbf71a84ac2c
Component: engine
2015-04-13 17:48:53 -07:00
3657626534
Move utils from commands_test.go into utils.go
...
Everything else was gone from this file except these utils which are
being used in other files and can't yet be removed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7d738e0b8c650817b8596e8c12fbe0baa3f045ed
Component: engine
2015-04-13 20:48:26 -04:00
0ca0f7ea18
Remove TestRunAutoremove
...
This test is already being skipped, and is also fully tested by
`TestRunContainerWithRmFlagExitCodeNotEqualToZero`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 125747e967e82788df8799622f28a7bcd97a03ad
Component: engine
2015-04-13 20:48:26 -04:00
7cb5356905
MovetAttachDisconnect to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e4cfd9b3924fae0369956b4f0e7f73a7e3b0cbf7
Component: engine
2015-04-13 20:48:26 -04:00
62b5c75dea
Move TestAttachDetachTruncatedID to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 28cda048384ac8913f4912758fe35a673f4f8465
Component: engine
2015-04-13 20:48:26 -04:00
500830abe9
Move TestAttachDetach to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ae0883ce009daa2b94e67264cfa5a13b4cae76bf
Component: engine
2015-04-13 20:48:26 -04:00
e303a2505f
Move TestRunDetach to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f7538c77efaf47fa5b82ae844b5c01887239ce65
Component: engine
2015-04-13 20:48:24 -04:00
afa485daa3
Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem
...
Add detection for F2Fs and JFS
Upstream-commit: f68ad63496aefb3d4c4c457bfbb113296b14e234
Component: engine
2015-04-13 17:32:47 -07:00
bb0567addc
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b85ade79d5a2cceb926fcae13997a6dfa28be4bc
Component: engine
2015-04-14 08:32:25 +08:00
c7a9533eb2
Merge pull request #12351 from jfrazelle/fix-test-daemon-with-wrong-key-messing-up-builds
...
cleanup daemon tests
Upstream-commit: b93d3f876814b23b2b7934783b02d40c0b3f6ca1
Component: engine
2015-04-13 20:31:41 -04:00
5ed1c63736
Merge pull request #11920 from SvenDowideit/flesh-out-docker-hub-automated-builds-docs
...
Researching Docker Hub account linking and automated builds details
Upstream-commit: e8a7e762839ae8a70f8bb6f25fded156bedc2277
Component: engine
2015-04-14 10:31:21 +10:00
f0104588db
Researching Docker Hub account linking and automated builds details
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a55f8e1ce734035a77cc13d1e2f42dbef41d418e
Component: engine
2015-04-14 10:29:55 +10:00
81dfdc7b63
Add detection for F2Fs and JFS
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Alphabetize FSMagic list to make more human-readable.
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 7e2d05b4938c010bf15224bd2857e2dca92ec9b3
Component: engine
2015-04-13 17:01:43 -07:00
99af06daa4
Merge pull request #12349 from calavera/patch-1
...
Fix JSON format in the remote api configuration examples.
Upstream-commit: 24df333fa555bc3768bf6509f06e306bf11b835f
Component: engine
2015-04-13 16:59:12 -07:00
ce3584d9d7
cleanup test wrong key.json leading to other failures
...
wait for container to be running before trying to kill it in daemon tests
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 9a87553e4fc6c0abdd298893deefc44050208dda
Component: engine
2015-04-13 16:58:44 -07:00
a4111cba55
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
2015-04-14 01:37:36 +02:00
b524d0385e
Fix JSON format in the remote api configuration examples.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d71c929d081c2fb7c33b36ae5db40014163f9b6c
Component: engine
2015-04-13 16:12:00 -07:00
