431c5ef3c2
Merge pull request #13583 from vdemeester/pkg-timeutils-test-coverage
...
Add test coverage to pkg/timeutils
Upstream-commit: 34342e9cef5499aa6d67d1e53cb33be9aaf54d2c
Component: engine
2015-05-29 09:35:34 -04:00
fe89ed5cd6
avoid 88-chars mountpoint length limit on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: 112b7e654691caa2b5ec283d70cf36245dfab365
Component: engine
2015-05-29 16:33:04 +03:00
ace81f28be
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 22fda380a97795cd83ad8bc4027e1bcd1ad490a6
Component: engine
2015-05-29 22:56:35 +08:00
1f0c675929
Add test coverage to pkg/timeutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9aa8a590b74e5260df649c303d9b03d52cbb32bb
Component: engine
2015-05-29 15:09:35 +02:00
7e5bfe1810
Update bash completion for 1.7.0
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b2832dffe5563486dd9dec7ed1b0183a1f320a2e
Component: engine
2015-05-29 12:42:59 +02:00
bd48177d0f
update lxc url
...
Signed-off-by: XiaoBing Jiang <s7v7nislands@gmail.com >
Upstream-commit: 2b69b326bc3a061ef0f277f35da336d20f3f6bcb
Component: engine
2015-05-29 16:10:57 +08:00
49406310ca
return error when failed to read http response body
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: de225b5d130f40189297e12ceb1593949ca24219
Component: engine
2015-05-29 12:52:51 +08:00
731e6df224
bug fix: close http response body no longer in use
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6c49576a860433d89b3c2d651bdca386353128cc
Component: engine
2015-05-29 12:03:40 +08:00
54f8d58fdb
Fixing Mac Boot2Docker installation doc
...
Signed-off-by: Anchal Agrawal <aagrawa4@illinois.edu >
Upstream-commit: 27ffccf540fa9a5b0e0bbd999a36b4c8c54a8f93
Component: engine
2015-05-28 22:53:54 -05:00
fd72895a8e
Merge pull request #13566 from jfrazelle/fix-lxc-tests
...
skip test on lxc
Upstream-commit: 7f6a7973cd12048a6518321d4d0eae55437a44e8
Component: engine
2015-05-28 16:19:21 -07:00
3b9c3b2725
Merge pull request #13530 from jfrazelle/bump-api-version
...
bump api version to 1.20
Upstream-commit: fcdea09ea52391d1a36b514acd9f1e77d092bd35
Component: engine
2015-05-28 16:14:30 -07:00
5efbaa4c3a
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
Upstream-commit: 7317b84ce0fd85c8ab2e6c1dda07567225299805
Component: engine
2015-05-28 15:51:06 -07:00
8d306cf8a5
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
2015-05-29 00:42:11 +02:00
16f1d90a66
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: e76d0f55717e08eff68604a52f0b2f1d7c27809c
Component: engine
2015-05-28 15:32:05 -07:00
0729d1a2d6
Merge pull request #13562 from moxiegirl/fixes-to-119-api
...
Fixes to the 1.19 version Thank you @thaJeztah and @jfrazelle!
Upstream-commit: 742a8a6cffb4a8607fc803aaaf18b51e927bbbda
Component: engine
2015-05-28 15:25:08 -07:00
9a122de919
Make the version mismatch message more explicit.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 7b6f9da52c961da18e2a91c4fcb8f124880244d8
Component: engine
2015-05-28 17:54:48 -04:00
fefb50c37a
skip test on lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 1392f99a974bd03848b1080a263db2b7def2fc02
Component: engine
2015-05-28 14:54:12 -07:00
090e23d354
Fixes to the 1.19 version
...
updating with changes to this instant
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 30901609a825189e970ed8077b243af293a2b1de
Component: engine
2015-05-28 14:25:26 -07:00
5c975d5605
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
Upstream-commit: 1f22676fcb2c6f2bd1a1cbf6123587c4d4e917d0
Component: engine
2015-05-28 14:15:34 -07:00
c7b23d13f1
Add comment about ulimit format.
...
Fixes #12116
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9292859fcef2306caeb494ee0eaf0ef98aa190d6
Component: engine
2015-05-28 14:14:07 -07:00
744dbdd6f9
Mount bind volumes coming from the old volumes configuration.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 53d9609de472f2fc9e6aaef2b713f526605f4ab8
Component: engine
2015-05-28 14:06:17 -07:00
21fa1411f6
Expand unshare test to include privileged test
...
This ensures that AppArmor, not other mechanisms used
by Docker or the kernel is restricting the mount.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: e58161fedcb8718c3880eb1778e29468e4cb72bd
Component: engine
2015-05-28 16:49:48 -04:00
147b33c180
Treat systemd listeners as all other
...
Fix #13549
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6f9fa64645cd67eb10a9c8bd903df518d572f50d
Component: engine
2015-05-28 12:15:03 -07:00
36c5713067
Windows: Undo 908db518 for Windows daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d66ae6741851e587e881b31e4b72bbccc253e958
Component: engine
2015-05-28 12:04:09 -07:00
b27566c00b
Merge pull request #13430 from runcom/fix-race-modify-request
...
Fix race in httpsRequestModifier.ModifyRequest when writing tlsConfig
Upstream-commit: 3bda841e3e2e32ca3b35887e5affa96db506bcd6
Component: engine
2015-05-28 11:31:04 -07:00
da2cc90fcd
Merge pull request #13416 from Microsoft/10662-fixintegrationtests
...
Windows: Pass temp environment through
Upstream-commit: 37cc42ee0e742a14047f32ef27c9b8b2371e1fb8
Component: engine
2015-05-28 11:22:37 -07:00
9749c4b6ff
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
Upstream-commit: 617a0c2fde69f2954c2d8959e23e1459636f753e
Component: engine
2015-05-28 11:09:02 -07:00
0f1265a12c
Merge pull request #13539 from tianon/deb-ubuntu-wily
...
Add Ubuntu Wily (15.10) as a build-deb target
Upstream-commit: f99a96274254a8c861b654c1caf6062b7c23e1de
Component: engine
2015-05-28 11:01:27 -07:00
effc81b4da
Merge pull request #13551 from albers/pgp-over-http
...
Use http for PGP key download
Upstream-commit: 24a0800d879b97614b5d0f43aea8f7ce74c33809
Component: engine
2015-05-28 10:59:14 -07:00
2fdedbf13a
Merge pull request #13529 from hqhq/hq_skip_cgroup_test
...
Skip test if not have Cpu quota or Cpu period
Upstream-commit: 5bb6262d88356f12e280bdcaf400fdea3d46d525
Component: engine
2015-05-28 10:57:32 -07:00
11639a1786
Merge pull request #13512 from moysesb/progressreader_close_silently
...
Close progressreader silently when read is complete.
Upstream-commit: 85096cfd4fa52fa7dd66e7c2d797e4637fecd04b
Component: engine
2015-05-28 10:54:08 -07:00
0faed528d2
Merge pull request #13039 from stevenbrichards/13031-Upstart
...
Fix check for upstart not detecting properly
Upstream-commit: 0256bbdebbc2fa7911c6e12bfae488fab7b30301
Component: engine
2015-05-28 10:38:55 -07:00
6523739243
Merge pull request #13548 from kvasdopil/zfs_magicnum
...
ZFS filesystem magic number check is fixed on FreeBSD
Upstream-commit: b90732f801ac7bdd61f3515719d40cab818c88f3
Component: engine
2015-05-28 10:27:12 -07:00
d4294d6fd6
Modified progress reader to close silently when read is complete.
...
Closes #13432
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: 709fa2ad876968b1f9598da1dfe64c27ae5522ec
Component: engine
2015-05-28 14:09:30 -03:00
abc263e355
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
Upstream-commit: 45488f9dc0e2ad5087776445e2069a9ea2c8bf80
Component: engine
2015-05-28 12:59:57 -04:00
f9d5a53954
Merge pull request #13538 from tianon/rpm-fedora-22
...
Add fedora:22 to our rpm targets
Upstream-commit: 70bedc8ee5370eaf621bec3a936ee7d86a1d3f48
Component: engine
2015-05-28 09:55:09 -07:00
5dd5db33a8
Fixes #13031 - Check for upstart or init is not detecting properly
...
This will now properly check whether /etc/init.d/docker or service docker is
invoking the script and respond to the user accordingly.
Signed-off-by: Steven Richards <steven@axiomzen.co >
Upstream-commit: e5ff643aed78fb5dfb5e3fef518dfe56b82b3023
Component: engine
2015-05-28 09:52:05 -07:00
5e9b1d1a70
Merge pull request #13269 from Microsoft/10662-statsrefactor
...
Windows: refactor stats
Upstream-commit: 27919bab2d538961ecdcd06a095d1e9d310621c5
Component: engine
2015-05-28 12:46:34 -04:00
570b91cfd7
Merge pull request #13055 from Microsoft/10662-internalsfixperms
...
Windows: Fixup builder/internals.go
Upstream-commit: 33c7c01a62390d55c4433ad45dd4632cf7112f81
Component: engine
2015-05-28 12:31:45 -04:00
91648786e7
Merge pull request #13535 from coolljt0725/fix_automatically_publish_without_publish
...
Fix automatically publish ports without --publish-all or --publish
Upstream-commit: a364dd8fc66825a385e09fc1ef21338833c72ed0
Component: engine
2015-05-28 11:49:53 -04:00
ffcd5b22b0
zfs magicnumber check on freebsd is fixed
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: 36bf6e44402bc6a0fbf169a73579e47e3f97f1a3
Component: engine
2015-05-28 18:38:08 +03:00
d4bd5f0238
Use http for PGP key download
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c1c5d760a6dabdc73017402eee5109b81465d438
Component: engine
2015-05-28 16:43:36 +02:00
17288ec3a7
Merge pull request #13541 from coolljt0725/remove_reduntant_enter_create
...
Clean up: remove redundant '\n' in Create
Upstream-commit: ac7a33b45ce5061079226a254e1fe6173d3fbd81
Component: engine
2015-05-28 10:30:07 -04:00
c8cd83907a
Clean up: remove redundant '\n' in Create
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: bcd076b5fea51b37dd2a7523fdd02944a96fc265
Component: engine
2015-05-28 17:08:55 +08:00
3817bdd3ec
Add Ubuntu Wily (15.10) as a build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 38c77ba876b64e9019091a1f089f90d341cd14ba
Component: engine
2015-05-28 01:06:11 -07:00
5a7a988cff
Add fedora:22 to our rpm targets
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 96903c837f25679faf67ffbcb9a9050c0cc2519a
Component: engine
2015-05-28 01:01:45 -07:00
390f1fbecf
Merge pull request #13515 from lloydde/doc-cli-lint
...
doc cli lint.
Upstream-commit: 7011d9ee8ac4990bfc3bfec422db3ab17abf46f1
Component: engine
2015-05-28 09:13:25 +02:00
781e46f9bc
Skip test if not have Cpu quota or Cpu period
...
Closes : #13522
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 34e5b6af19b916ec0debcc8bcb76313302b77a27
Component: engine
2015-05-28 14:59:58 +08:00
097c5661ee
remove redundant mount/unmount calls on commit
...
daemon.Diff already implements mounting for naivegraphdriver and
aufs which does diffing on its owns does not need the container to be mounted.
So new filesystem driver should mount filesystems on their own if it is needed
to implement Diff(). This issue was reported by @kvasdopil while working on a
freebsd port, because freebsd does not allow mount an already mounted
filesystem. Also it saves some cycles for other operating systems as well.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 6473b0f127c63e8a45b2b456d69e3de03273705c
Component: engine
2015-05-28 08:43:31 +02:00
a3f2ea4982
fix release script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 9f619282dba2f42ada6f7e92705a1c8979193214
Component: engine
2015-05-27 20:57:46 -07:00
Doug Davis
Alexey Guskov
Hu Keping
Vincent Demeester
Harald Albers
XiaoBing Jiang
Zhang Wei
Anchal Agrawal
Jessie Frazelle
David Calavera
Antonio Murdaca
Jessica Frazelle
moxiegirl
Raghuram Devarakonda
Eric Windisch
Alexander Morozov
John Howard
Alexander Morozov
Moysés Borges
Brian Goff
Steven Richards
Lei Jitang
Tianon Gravi
Sebastiaan van Stijn
Qiang Huang
Jörg Thalheim