6fa2a1e486
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
2015-04-13 13:32:45 -07:00
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
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
e961f7da67
Merge pull request #12341 from jfrazelle/add-vet-script
...
Add vet script
2015-04-13 13:13:56 -07:00
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
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
afd973c497
Merge pull request #12342 from LK4D4/fix_vet_warn
...
Fix vet warning
2015-04-13 12:56:47 -07:00
f3ba0a6a35
change tabs to spaces
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-13 12:48:40 -07:00
3280ce651b
Adds validate-vet script
...
resolves #11970
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-04-13 12:48:05 -07:00
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
82256c2a54
Merge pull request #12340 from crosbymichael/syslog-tags
...
move syslog-tag to syslog.New function
2015-04-13 14:51:00 -04:00
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
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
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
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
a8e095b243
Merge pull request #12293 from hqhq/hq_use_hostconfig
...
use hostConfig in verifyDaemonSettings
2015-04-13 14:34:35 -04:00
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
3509132a6e
Merge pull request #12301 from ewindisch/https_links
...
Use HTTPS links for URLs in READMEs / comments / docs
2015-04-13 14:30:53 -04:00
4f91a333d5
move syslog-tag to syslog.New function
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-13 11:24:18 -07:00
85f1410a5a
Merge pull request #12049 from tianon/bundles-latest
...
Add "bundles/latest" symlink
2015-04-13 11:11:38 -07:00
38761bda79
Merge pull request #12264 from Mashimiao/add-event-log-for-push
...
Add event log for push
2015-04-13 11:03:09 -07:00
0e46cc9be4
Merge pull request #12325 from hqhq/hq_fix_build_test
...
fix build test by adding --no-cache
2015-04-13 10:57:19 -07:00
76eeb5d777
Merge pull request #12291 from coolljt0725/add_cfs_bandwidth_to_check_config
...
Add CFS_BANDWIDTH to check-config
2015-04-13 10:55:31 -07:00
5a174e5def
Merge pull request #12297 from vdemeester/11603-pkg-archive-test-coverage
...
Add test on archive.go (#11603 )
2015-04-13 10:54:21 -07:00
c19bee4fb0
Merge pull request #12338 from LK4D4/fix_compile_integr_cli
...
Fix errors due changed sockRequest signature
2015-04-13 10:50:38 -07:00
27fccdbabb
Fix errors due changed sockRequest signature
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-13 10:30:07 -07:00
9a0a4ac02f
Merge pull request #12331 from coolljt0725/fix_panic_release_nil_interface
...
Fix daemon panic when release a nil network interface
2015-04-13 10:13:57 -07:00
6f928be7ef
Merge pull request #12320 from runcom/fix-api-resize-exec-resize
...
fix api server resize&execResize
2015-04-13 09:59:11 -07:00
33e83d0581
Merge pull request #12279 from runcom/remove-job-commit
...
Remove job from commit
2015-04-13 09:57:54 -07:00
d42753485b
Add "bundles/latest" symlink
...
This is a symlink to the latest "bundle" that was assembled. For example, if `VERSION` is currently `1.5.0-dev`, then `bundles/latest` will be a symlink to `bundles/1.5.0-dev` after an attempted build.
One interesting property of this is that after a successful `binary` build, we can `./bundles/latest/binary/docker -v` and get back something like `Docker version 1.5.0-dev, build 3ff6723-dirty`.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-04-13 10:54:17 -06:00
5ad15479a0
Add a note about PID 1 not terminating on SIGINT/SIGTERM.
...
Also re-arranged the description of CTRL-c to make it clearer.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-04-13 17:39:38 +01:00
12eff0c26f
Merge pull request #12312 from runcom/remove-job-container-stats
...
Remove job from container stats
2015-04-13 11:58:31 -04:00
a4f98d3225
Merge pull request #12313 from runcom/remove-job-export
...
Remove job from export
2015-04-13 11:57:55 -04:00
bfb487dc50
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
2015-04-13 08:38:46 -07:00
9c48f6d9a5
Merge pull request #12314 from runcom/remove-engine-links
...
Remove engine from links
2015-04-13 11:27:13 -04:00
871f4cdccb
Merge pull request #12326 from xiaods/issure-12316
...
correct pkg/stdcopy NewStdWriter function comments
2015-04-13 09:39:34 -04:00
6b737752e3
Remove job from export
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 15:27:45 +02:00
ad41ba1f95
Merge pull request #12321 from HuKeping/testcase_typo
...
Fix typo in testcase
2015-04-13 08:48:41 -04:00
1567cf2cdf
Fix typo in testcase
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-13 23:09:07 +08:00
8b35481292
Fix daemon panic when release a nil network interface
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-13 20:24:10 +08:00
a715b0e31b
correct pkg/stdcopy NewStdWriter function comments
...
pkg/stdcopy NewStdWriter function has wrong doc comment,
utils is not correct, it should be stdcopy
Signed-off-by: Deshi Xiao <xiaods@gmail.com>
2015-04-13 17:21:27 +08:00
c49cc1f2fb
fix build test by adding --no-cache
...
Testcase TestBuildResourceConstraintsAreUsed run build without
--no-cache, so if you run this test twice, it will fail the
second time.
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[PASSED]
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[FAIL]
Because we'll use cID to inspect field and will get empty cID
if we have cache.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-13 16:24:49 +08:00
3341f3a355
fix api server resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:42:12 +02:00
65a056345c
Remove jobs from stats
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:33:53 +02:00
91bfed6049
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:25:31 +02:00
f5a07f0c88
Add event log for push
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-13 09:41:15 +08:00
908db51804
Send archive options via pipe in chrootarchive
...
After finding our initial thinking on env. space versus arg list space
was wrong, we need to solve this by using a pipe between the caller and
child to marshall the (potentially very large) options array to the
archiver.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-04-12 21:16:54 -04:00
80e9f6f838
More review feedback addressed
...
Signed-off-by: John Gossman <johngos@microsoft.com>
2015-04-12 16:26:37 -07:00
4ce19da739
Addressed feedback. Will squash after further review
...
Signed-off-by: John Gossman <johngos@microsoft.com>
2015-04-12 15:49:29 -07:00
7560018541
Remove engine from links
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 16:25:10 +02:00
Michael Crosby
Evan Hazlett
Alexander Morozov
Jessica Frazelle
bobby abbott
David Calavera
Alexander Morozov
James Turnbull
Deng Guangxing
Jessie Frazelle
Tianon Gravi
Bryan Boreham
Brian Goff
Doug Davis
Antonio Murdaca
Hu Keping
Lei Jitang
Deshi Xiao
Qiang Huang
Ma Shimiao
Phil Estes
John Gossman