9fa728d386
Merge pull request #12391 from ibuildthecloud/syslog-format
...
Change syslog format and facility
Upstream-commit: 2e4d36ed80855375231501983f19616ba0238a84
Component: engine
2015-04-15 14:47:12 -07:00
78dcc43512
Change syslog format and facility
...
This patch changes two things
1. Set facility to LOG_DAEMON
2. Remove ": " from tag so that the tag + pid become a single column in
the log
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 05641ccffc5088a382fa3bfb21f1276ccb6c1fc0
Component: engine
2015-04-15 12:46:43 -07:00
131a9e6fbb
Fix TestInitializeCannotStatPathFileNameTooLong
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7afb2347415a8e92020c037bacf5d11467c78e9b
Component: engine
2015-04-15 21:15:05 +02:00
72f22eceb7
Merge pull request #12369 from runcom/fix-links-graph-ref
...
Fix wrong graphdb refs paths purging
Upstream-commit: 5b048ab2f2aea807033eba7a0ac078303c050826
Component: engine
2015-04-15 11:34:58 -07:00
ab74fc7837
Merge pull request #12387 from x1022as/inspect-logpath
...
Inspect show right LogPath in json-file driver
Upstream-commit: f0c60f7085ea124c2d3660fae17c1d2ab7e4abb0
Component: engine
2015-04-15 14:28:39 -04:00
8f5db65c9f
Merge pull request #12399 from emirozer/master
...
closes #8945
Upstream-commit: 2499baefddb03e38b38a413a7290340a3f4b7420
Component: engine
2015-04-15 10:53:10 -07:00
79544ae835
Merge pull request #12139 from hqhq/hq_add_cpusest_mems2
...
add support for cpuset.mems
Upstream-commit: 2ecccda1628388a6a29a2cd3bb40630f0afe5351
Component: engine
2015-04-15 13:29:43 -04:00
2fc98dbd3e
Merge pull request #12382 from jfrazelle/modprobe-all-the-things-modules-for-the-modules-god
...
try to modprobe bridge
Upstream-commit: ec4b0b1e277852a11c65d33e0f6b63542a88b222
Component: engine
2015-04-15 08:45:00 -07:00
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
fc7bcaf7a1
closes #8945
...
Signed-off-by: Emir Ozer <emirozer@yandex.com >
Upstream-commit: 960de9c8dd3d64dd4be0e851dd835e6d9427c70c
Component: engine
2015-04-15 15:31:23 +02:00
e04ea19d11
Inspect show right LogPath in json-file driver
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: acf025ad1b806fd9b5eb3358a8e1d75c6aae890d
Component: engine
2015-04-15 11:51:24 +08:00
9f222f171d
Add cpuset-mems support for docker build
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
2015-04-15 09:34:12 +08:00
4f6ebaa34e
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
2015-04-15 09:33:46 +08:00
292892934d
Merge pull request #12360 from yestin/11601-supplement-tests-part-2
...
Improve test accuracy for pkg/chrootarchive (part 2)
Upstream-commit: da697dbed6143761f585b3b2a35c6ef0b501dea8
Component: engine
2015-04-14 21:00:12 -04:00
0a58c2bd69
Merge pull request #12384 from calavera/fix_moxiegirl_handler
...
Fix @moxiegirl's handler to be consistent with other maintainers.
Upstream-commit: 3a3ab0e4e7cde049a39df1906907e7150fa02d03
Component: engine
2015-04-14 17:02:44 -07:00
79bd44bc5a
Fix @moxiegirl's handler to be consistent with other maintainers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d10c5d95a896197b504bae039dc6d9371917cdf1
Component: engine
2015-04-14 16:53:28 -07:00
3ed5aa62d9
Merge pull request #11945 from lmars/fix-upstart-post-start
...
Prevent Upstart post-start stanza from hanging
Upstream-commit: 485071f92e9fd804f009e416ab529312304713c5
Component: engine
2015-04-14 16:23:04 -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
0046932ffa
Fix wrong graphdb refs paths purging
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 088e69da35525fdf380ae73046d999332ea977fa
Component: engine
2015-04-14 23:10:43 +02: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
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
c4d568bf1b
Improve test accuracy for pkg/chrootarchive (part 2)
...
Check test correctness of untar by comparing destination with
source. For part 2, it checkes hashes of source and destination
files or the target files of symbolic links.
This is a supplement to the #11601 fix.
Signed-off-by: Yestin Sun <sunyi0804@gmail.com >
Upstream-commit: 67df8e4257c165bc6abe77bb8f4ab55c10b2fbff
Component: engine
2015-04-13 21:46:14 -07: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
