Brian Goff
de923f59b3
Merge pull request #12253 from calavera/remove_job_from_start_and_create
...
Remove engine.Job from Start and Create
2015-04-15 21:49:25 -04:00
Michael Crosby
a5f7c4aa31
Ensure state is destroyed on daemont restart
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-04-15 17:44:03 -07:00
Alexander Morozov
83d809f3d2
Merge pull request #12388 from xiaods/issue-12373
...
client.StatusError don't be returned as a pointer
2015-04-15 17:34:38 -07:00
Jessie Frazelle
2e4d36ed80
Merge pull request #12391 from ibuildthecloud/syslog-format
...
Change syslog format and facility
2015-04-15 14:47:12 -07:00
Sabin Basyal
6860c75b7b
The link to issue 407 was broken
...
The link to issue 407 was broken. The old link was: https://github.com/docker/docker/issues/407%20kernel%20versions
The link must be: https://github.com/docker/docker/issues/407
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
2015-04-15 14:06:11 -07:00
Brian Goff
0c7b51089c
Merge pull request #12412 from runcom/12410-fix-TestInitializeCannotStatPathFileNameTooLong
...
Fix TestInitializeCannotStatPathFileNameTooLong
2015-04-15 16:11:29 -04:00
Darren Shepherd
05641ccffc
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>
2015-04-15 12:46:43 -07:00
Antonio Murdaca
7afb234741
Fix TestInitializeCannotStatPathFileNameTooLong
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-15 21:15:05 +02:00
Alexander Morozov
5b048ab2f2
Merge pull request #12369 from runcom/fix-links-graph-ref
...
Fix wrong graphdb refs paths purging
2015-04-15 11:34:58 -07:00
Brian Goff
f0c60f7085
Merge pull request #12387 from x1022as/inspect-logpath
...
Inspect show right LogPath in json-file driver
2015-04-15 14:28:39 -04:00
moxiegirl
2499baefdd
Merge pull request #12399 from emirozer/master
...
closes #8945
2015-04-15 10:53:10 -07:00
Brian Goff
2ecccda162
Merge pull request #12139 from hqhq/hq_add_cpusest_mems2
...
add support for cpuset.mems
2015-04-15 13:29:43 -04:00
Deshi Xiao
bae3023eef
client.StatusError don't be returned as a pointer
...
closes #12373
1. remove & from client.StatusError
2. remove * from Error method
Signed-off-by: Deshi Xiao <xiaods@gmail.com>
2015-04-16 01:27:07 +08:00
David Calavera
767df67e31
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-15 10:22:07 -07:00
Jessie Frazelle
ec4b0b1e27
Merge pull request #12382 from jfrazelle/modprobe-all-the-things-modules-for-the-modules-god
...
try to modprobe bridge
2015-04-15 08:45:00 -07:00
Jessica Frazelle
b3867b8899
try to modprobe bridge
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-15 07:19:37 -07:00
Emir Ozer
960de9c8dd
closes #8945
...
Signed-off-by: Emir Ozer <emirozer@yandex.com>
2015-04-15 15:31:23 +02:00
Deng Guangxing
acf025ad1b
Inspect show right LogPath in json-file driver
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-15 11:51:24 +08:00
Qiang Huang
f8dc7e8754
Add cpuset-mems support for docker build
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:34:12 +08:00
Qiang Huang
8077b2fb80
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:33:46 +08:00
Phil Estes
da697dbed6
Merge pull request #12360 from yestin/11601-supplement-tests-part-2
...
Improve test accuracy for pkg/chrootarchive (part 2)
2015-04-14 21:00:12 -04:00
Michael Crosby
3a3ab0e4e7
Merge pull request #12384 from calavera/fix_moxiegirl_handler
...
Fix @moxiegirl's handler to be consistent with other maintainers.
2015-04-14 17:02:44 -07:00
Jason Divock
25d07511ed
Update basic setup instructions
...
Without adding the user to the group you're going to hit nasty TLS errors. Figured I'd save the next guy the hassle.
Problem more accurately described here:
https://github.com/docker/docker/issues/5314
Signed-off-by: Jason Divock <jdivock@box.com>
2015-04-14 16:56:34 -07:00
David Calavera
d10c5d95a8
Fix @moxiegirl's handler to be consistent with other maintainers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 16:53:28 -07:00
Jessie Frazelle
485071f92e
Merge pull request #11945 from lmars/fix-upstart-post-start
...
Prevent Upstart post-start stanza from hanging
2015-04-14 16:23:04 -07:00
David Calavera
002afbbe77
Make integration tests to call the new start and create endpoints.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:33 -07:00
David Calavera
98996a432e
Remove engine.Job from Create action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
David Calavera
610c436e07
Remove engine.Job from Start action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
Phil Estes
5395cdcae5
Merge pull request #12269 from kostickm/12251-remove-not-empty-check
...
Remove container name not empty check
2015-04-14 17:55:13 -04:00
Arnaud Porterie
ee54723485
Merge pull request #12379 from sharkone/patch-1
...
Remove sprious `fmt.Printf` from test
2015-04-14 14:25:16 -07:00
Antonio Murdaca
088e69da35
Fix wrong graphdb refs paths purging
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-14 23:10:43 +02:00
Thomas Texier
2ea1febd9a
Remove unnecessary fmt.Printf
...
Signed-off-by: Thomas Texier <sharkone@en-mousse.org>
2015-04-14 20:55:32 +00:00
Phil Estes
1e6f7e4ee5
Merge pull request #12356 from jfrazelle/godeps-lolololololololololololol
...
change go tools to use certain commit
2015-04-14 16:18:49 -04:00
Phil Estes
2f0f04e8fa
Merge pull request #12292 from cpuguy83/remove_commands_integration
...
Remove commands integration
2015-04-14 16:17:25 -04:00
Jessie Frazelle
74f4a88305
Merge pull request #11999 from vbatts/vbatts-decide_storage
...
graphdriver: prefer prior driver state
2015-04-14 13:04:21 -07:00
James Turnbull
62e8621095
Merge pull request #12357 from draghuram/prdoc
...
Improve the git instructions to update a PR.
2015-04-14 15:46:10 -04:00
Brian Goff
63331abbca
remove integration/utils setRaw funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-14 15:17:17 -04:00
Raghuram Devarakonda
18a8bcf072
Improve the git instructions to update a PR.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-04-14 15:11:35 -04:00
Alexander Morozov
676bf4afa5
Merge pull request #12282 from cpuguy83/remove_some_integration_tests
...
Move integration/server_test tests to integration-cli
2015-04-14 11:55:05 -07:00
Megan Kostick
98f857772f
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-14 11:27:06 -07:00
moxiegirl
a3d871220c
Merge pull request #12375 from moxiegirl/12366-change-fix
...
Fixing changed pushed without edit
2015-04-14 11:06:41 -07:00
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
Mary Anthony
4dd4bd00aa
Fixing changed pushed without edit
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-14 10:25:07 -07: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