d7c7374f11
bump version to 1.6.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: e79c77fb8d16ba38387e43fbf9224e341f252b95
Component: engine
2015-04-16 12:56:02 -07:00
fb913ffded
Bump version to v1.6.0
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
(cherry picked from commit 47496519da9664202d900d3635bb840509fa9647)
Upstream-commit: 99d0413033e6ecf05a30eac18d51349ef859a9c7
Component: engine
2015-04-16 12:45:02 -07:00
168a9e925d
Merge pull request #12428 from icecrime/1163_carry
...
Added documentation for functions
Upstream-commit: cb0644a196e0a91de50e81daa5fcf3b2645a8d45
Component: engine
2015-04-16 11:43:29 -07:00
049ea91a21
Merge pull request #12407 from cpuguy83/move_integration_api_tests
...
Move some integration api tests
Upstream-commit: 27edbd2868c5e44d54c5a51ca220fa4cd568e17a
Component: engine
2015-04-16 11:40:29 -07:00
ed720afd56
Merge pull request #12451 from moxiegirl/release-versions-set
...
doc fixes for 1.6
Upstream-commit: dfa5feab2fd31486f7e7bc532eac213dbaaea45d
Component: engine
2015-04-16 11:35:46 -07:00
fdae7fc749
for 1.6
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f44aa3b1fbe5e042fee0fb78507ebac35eca3d04
Component: engine
2015-04-16 11:33:49 -07:00
b5835957f0
Move TestPostCreateNull to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 308a23021d65282cdf471ef0708ba5998b48c247
Component: engine
2015-04-16 13:49:46 -04:00
6688a2d031
Move TestPostJsonVerify to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5dc02a2fa8819b3a61bcd5a6fedcfb1a5e64cba5
Component: engine
2015-04-16 13:49:28 -04:00
3cb6dbb528
Move TestContainerApiCreate to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 23fa7d41d5510131cdf7883a930087ac4fb34187
Component: engine
2015-04-16 13:49:10 -04:00
9e85fe7e11
Move TestPostCommit to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f19061ccfd526487391f7677bef7e1b38694d06a
Component: engine
2015-04-16 13:48:54 -04:00
51eea9357f
Move TestGetContainersTop to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d9e4b14346c6a93bee8c24803a8538dc2d74911d
Component: engine
2015-04-16 13:48:33 -04:00
f8e57bde88
Move SaveAndThenload to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6f5b895bc767585be9a8e1109672fb4946e56f15
Component: engine
2015-04-16 13:40:49 -04:00
c48f58ea6d
Make sockRequestRaw return reader, not []byte
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8232cc777e329a47e123dbdc42411dae65288a80
Component: engine
2015-04-16 13:40:49 -04:00
105ea026b0
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e41192a3f8cbfbbfecde03f58a3b2be2b1afd836
Component: engine
2015-04-16 18:50:24 +02:00
6cf040802b
Fix a typo in docker/daemon/state.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: 7e01ecc119ea3871058309a47a3f9cbf2a9483dd
Component: engine
2015-04-16 10:56:15 -04:00
586b88bb0d
Merge pull request #12423 from crosbymichael/idkbutitworks
...
Ensure state is destroyed on daemont restart
Upstream-commit: 1899b2f41a73a6596ba167c9c710affde3dae550
Component: engine
2015-04-15 21:19:38 -07:00
0d7f000ebe
added documentation for functions
...
Signed-off-by: Jason Smith <jasonrichardsmith@gmail.com >
Upstream-commit: dc104ccb40b66a89611f11737d78a2ad31102427
Component: engine
2015-04-15 19:28:01 -07:00
74e64db38a
Merge pull request #12426 from moxiegirl/new-registry-menu
...
In with the old menu layout
Upstream-commit: ad5d655fb2010b61995c9380346f8057e11b0056
Component: engine
2015-04-16 12:22:49 +10:00
0e1a426ed8
In with the old menu layout
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: fe8fb24b530016e56ab584526c093daccacf6040
Component: engine
2015-04-15 19:02:01 -07:00
884bdce09a
Merge pull request #12253 from calavera/remove_job_from_start_and_create
...
Remove engine.Job from Start and Create
Upstream-commit: de923f59b3860eba2c87e8a533b385ac5752243b
Component: engine
2015-04-15 21:49:25 -04:00
d0cae5a6bf
Ensure state is destroyed on daemont restart
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a5f7c4aa31fa1ee2a3bebf4d38f5fda7a4a28a0d
Component: engine
2015-04-15 17:44:03 -07:00
1fe5faa4a6
Merge pull request #12388 from xiaods/issue-12373
...
client.StatusError don't be returned as a pointer
Upstream-commit: 83d809f3d2742b85933ba8a93fa7d46fe48495dc
Component: engine
2015-04-15 17:34:38 -07:00
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
1931a4d310
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 >
Upstream-commit: bae3023eef0ed8e0eb517ca53f6f97f1bf6786d3
Component: engine
2015-04-16 01:27:07 +08:00
234898b4e7
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 767df67e3149b83255db0809f6543b449a4f652e
Component: engine
2015-04-15 10:22:07 -07: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
ea6bddb0de
Make integration tests to call the new start and create endpoints.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 002afbbe77abe722b8d0c6a2d3f11a258509f430
Component: engine
2015-04-14 15:33:33 -07:00
fa70da1003
Remove engine.Job from Create action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 98996a432e079d1434182ea1cf84e70c927da4c2
Component: engine
2015-04-14 15:33:12 -07:00
c44394bb9b
Remove engine.Job from Start action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 610c436e07388f4898020432b25939cc7104b894
Component: engine
2015-04-14 15:33:12 -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
