Alexander Morozov
5be5749d54
Merge pull request #12370 from buddhamagnet/11593-api-client-docs
...
add docs for DockerCli and NewDockerCli fixes #11593
2015-04-14 11:00:19 -07:00
buddhamagnet
69747b3c1e
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com >
2015-04-14 18:33:11 +01:00
Brian Goff
040176f6e1
Merge pull request #12214 from ahmetalpbalkan/namesgenerator/localrand
...
names-generator: use local random instance
2015-04-14 13:10:26 -04:00
Alexander Morozov
7b29a88146
Merge pull request #12374 from kostickm/12343-fix-vet-warning-archive
...
Fix vet warning in archive.go
2015-04-14 10:06:04 -07:00
Alexander Morozov
3748def343
Merge pull request #12366 from bboreham/12337-force-push
...
Add -f option and explanation to push after rebase
2015-04-14 09:59:48 -07:00
Brian Goff
392fd243bc
Merge pull request #12365 from HuKeping/list
...
Use local variable err instead of a outer one
2015-04-14 12:49:15 -04:00
Alexander Morozov
398220f5ff
Merge pull request #12368 from ZJU-SEL/fix-memory-stats-doc
...
fix memory stats display document
2015-04-14 09:44:44 -07:00
Alexander Morozov
8f0b63925e
Merge pull request #12363 from ahmetalpbalkan/integ-cli/use-sockRequest-statuscode
...
integ-cli: Use status code from sockRequest (fix #12335 )
2015-04-14 09:38:10 -07:00
Hu Keping
a0804e8e11
Use local variable err instead of a outer one
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-15 00:29:53 +08:00
Megan Kostick
fc20658a01
Fix vet warning in archive.go
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-14 09:13:50 -07:00
Phil Estes
fe53c27785
Merge pull request #11992 from runcom/11923-refactor-utils-utils
...
Refactor utils/utils, fixes #11923
2015-04-14 12:01:23 -04:00
Alexander Morozov
5019f35111
Merge pull request #11980 from sunyuan3/TestSearchCmdOptions
...
add TestSearchCmdOptions case
2015-04-14 08:34:40 -07:00
wonderflow
d791f7e9f8
fix memory stats display document
...
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
2015-04-14 18:34:20 +08:00
Bryan Boreham
c89ddb6d01
Add -f option and explanation to push after rebase
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
2015-04-14 10:53:37 +01:00
Ahmet Alp Balkan
531433e765
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 >
2015-04-14 08:07:50 +00:00
Ahmet Alp Balkan
25fab69f7d
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 >
2015-04-14 02:35:16 +00:00
Yuan Sun
77f2a4a0e3
add TestSearchCmdOptions case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-14 09:23:26 +08:00
Arnaud Porterie
00eddf5e67
Merge pull request #12353 from sunyuan3/duplicate
...
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
2015-04-13 17:48:53 -07:00
Jessie Frazelle
f68ad63496
Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem
...
Add detection for F2Fs and JFS
2015-04-13 17:32:47 -07:00
Yuan Sun
b85ade79d5
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-14 08:32:25 +08:00
Brian Goff
b93d3f8768
Merge pull request #12351 from jfrazelle/fix-test-daemon-with-wrong-key-messing-up-builds
...
cleanup daemon tests
2015-04-13 20:31:41 -04:00
Sven Dowideit
e8a7e76283
Merge pull request #11920 from SvenDowideit/flesh-out-docker-hub-automated-builds-docs
...
Researching Docker Hub account linking and automated builds details
2015-04-14 10:31:21 +10:00
Sven Dowideit
a55f8e1ce7
Researching Docker Hub account linking and automated builds details
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-04-14 10:29:55 +10:00
Megan Kostick
7e2d05b493
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 >
2015-04-13 17:01:43 -07:00
Jessie Frazelle
24df333fa5
Merge pull request #12349 from calavera/patch-1
...
Fix JSON format in the remote api configuration examples.
2015-04-13 16:59:12 -07:00
Jessica Frazelle
9a87553e4f
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 >
2015-04-13 16:58:44 -07:00
Antonio Murdaca
c30a55f14d
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-14 01:37:36 +02:00
David Calavera
d71c929d08
Fix JSON format in the remote api configuration examples.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-13 16:12:00 -07:00
Michael Crosby
7ecf4e5d4d
Merge pull request #12166 from cpuguy83/remove_err_when_volume_exists
...
Don't return error when adding existing volume
2015-04-13 14:15:48 -07:00
Michael Crosby
12f7db1830
Merge pull request #12025 from coolljt0725/add_exec_with_user
...
Add docker exec run command as a different user and in privileged mode
2015-04-13 13:50:51 -07:00
Michael Crosby
b5c3d01e6b
Merge pull request #12044 from reteptilian/11721-remove-randomstring-3
...
fixes 11721 replace stringutils.GenerateRandomString with stringid.GenerateRandomID
2015-04-13 13:47:50 -07:00
Brian Goff
579c9ec1d0
Don't return error when adding existing volume
...
Error wasn't really doing anything except for making a bunch of extra
debug logs.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 16:45:35 -04:00
Michael Crosby
8652ca5d5f
Merge pull request #12111 from tianon/builder-deb
...
Add "builder-deb" base images for building ".deb" packages properly
2015-04-13 13:41:17 -07:00
Michael Crosby
6fa2a1e486
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
2015-04-13 13:32:45 -07:00
Michael Crosby
3d424ead3b
Merge pull request #12287 from calavera/check_memory_swap_when_disabled
...
Log memory swap capabilities properly.
2015-04-13 13:19:52 -07:00
Evan Hazlett
b6e64981e6
Merge pull request #12204 from yestin/11601-supplement-tests-part-1
...
Improve test accuracy for pkg/chrootarchive (part 1)
2015-04-13 16:14:18 -04:00
Alexander Morozov
e961f7da67
Merge pull request #12341 from jfrazelle/add-vet-script
...
Add vet script
2015-04-13 13:13:56 -07:00
Michael Crosby
75b911eb3c
Merge pull request #12222 from chenhanxiao/cp-support-colon
...
cp: add support for copy filename with ":"
2015-04-13 13:09:12 -07:00
Evan Hazlett
6b40377c18
Merge pull request #12262 from YanFeng-Adam/daemon
...
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
2015-04-13 16:00:20 -04:00
Michael Crosby
afd973c497
Merge pull request #12342 from LK4D4/fix_vet_warn
...
Fix vet warning
2015-04-13 12:56:47 -07:00
Jessica Frazelle
f3ba0a6a35
change tabs to spaces
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-13 12:48:40 -07:00
bobby abbott
3280ce651b
Adds validate-vet script
...
resolves #11970
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-04-13 12:48:05 -07:00
David Calavera
7523beff41
Log memory swap capabilities properly.
...
Check whether the swap limit capabilities are disabled or not only when memory swap is set to greater than 0.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-13 11:56:59 -07:00
Evan Hazlett
82256c2a54
Merge pull request #12340 from crosbymichael/syslog-tags
...
move syslog-tag to syslog.New function
2015-04-13 14:51:00 -04:00
Evan Hazlett
05433a4dab
Merge pull request #12275 from LK4D4/pid_host_hell
...
Get process list after PID 1 dead
2015-04-13 14:50:23 -04:00
Evan Hazlett
9e0a55b48c
Merge pull request #12276 from estesp/10246-really-fix-arg-list
...
Send archive options via pipe in chrootarchive
2015-04-13 14:44:47 -04:00
Alexander Morozov
213eab995a
Fix vet warning
...
pkg/archive/archive_test.go:496: arg changes for printf verb %s of wrong type: []archive.Change
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-13 11:43:30 -07:00
James Turnbull
e29dcd91bd
Merge pull request #12228 from bboreham/12022-signal-doc
...
Add a note about PID 1 not terminating automatically on signal
2015-04-13 14:41:07 -04:00
Evan Hazlett
a8e095b243
Merge pull request #12293 from hqhq/hq_use_hostconfig
...
use hostConfig in verifyDaemonSettings
2015-04-13 14:34:35 -04:00
Evan Hazlett
3434f64827
Merge pull request #12300 from johngossman/master
...
Added some error messages and tracing to bridge network initialization
2015-04-13 14:32:56 -04:00