6f2ef90bf2
Merge pull request #13605 from tianon/vim-dockerfile
...
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
Upstream-commit: e2524d8ace359497e9e02eaa90c3d36ef6c36508
Component: engine
2015-05-29 14:16:50 -07:00
7d3e38efca
Merge pull request #13527 from duglin/FixImagesPrefixNotFound
...
Fix error when trying to delete an image due to a bad container
Upstream-commit: a39de418719dc6189025a760ca6b5c024a177b24
Component: engine
2015-05-29 14:09:26 -07:00
1efd411c44
Merge pull request #13577 from WeiZhang555/httpClose
...
bug fix: close http response body no longer in use
Upstream-commit: 1680c78e630611a968b24a7064b1a1cd80614d75
Component: engine
2015-05-29 16:59:17 -04:00
03bef78b33
Merge pull request #13578 from WeiZhang555/errRet
...
return error when failed to read http response body
Upstream-commit: 8d726709ad1479693c3c326fd69b432799b82192
Component: engine
2015-05-29 16:57:27 -04:00
4b65abde07
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: e02744404d34027d1b358986bedd8557805aae58
Component: engine
2015-05-29 13:46:51 -07:00
d7b3086241
Merge pull request #13589 from vdemeester/pkg-stringutils-test-coverage
...
Add test coverage for pkg/stringutils
Upstream-commit: 3b831a2f3af01727ba91fc52c31c6682eeef69b3
Component: engine
2015-05-29 13:38:12 -07:00
24139366a7
Merge pull request #13564 from burke/fix-memory-leak
...
Use bufio.Reader instead of bufio.Scanner for logger.Copier
Upstream-commit: c42810fe9981c07e7de55aa65af44d618dd4e6ce
Component: engine
2015-05-29 13:37:15 -07:00
5058d1b5fc
Merge pull request #13255 from vdemeester/11588-pkg-pools-test-coverage
...
Add test coverage for pkg/pools (#11588 )
Upstream-commit: 04a451998f28054972d5cd4c26082c4092a9dc35
Component: engine
2015-05-29 13:36:20 -07:00
5fa31c9647
Merge pull request #13598 from calavera/fix_windows_build
...
Do not require cgroups capabilities on windows to run the integration tests.
Upstream-commit: 4c9fd72a91543bff32241198704f77fa38eaf5c8
Component: engine
2015-05-29 12:57:40 -07:00
27dbc6f29e
Merge pull request #13581 from s7v7nislands/fix_lxc_url
...
update lxc url
Upstream-commit: b21ef2d1d31431b9628ae39a77050a5897369b06
Component: engine
2015-05-29 11:48:44 -07:00
9a7a5b0edf
Do not require cgroups capabilities on windows to run the integration tests.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9141012966db62b36b7d3d1df7af877bbd2d172
Component: engine
2015-05-29 11:42:40 -07:00
d6425cf5ab
Merge pull request #13482 from boucher/criu-libcontainer-update
...
Update vendored libcontainer
Upstream-commit: 6d8e517bce90866abcf311cd5cc079ad8cce2a86
Component: engine
2015-05-29 10:28:58 -07:00
b652716d1c
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
Upstream-commit: f1fed87fc01c31114b78a6ca9f7060fc93480957
Component: engine
2015-05-29 10:21:57 -07:00
278360f512
Merge pull request #13585 from albers/completion-1.7
...
Update bash completion for 1.7.0
Upstream-commit: 24d9edd8d11a383b77019099214e36029e49919b
Component: engine
2015-05-29 09:43:44 -07:00
c9400d42cc
Use bufio.Reader instead of bufio.Scanner for logger.Copier
...
When using a scanner, log lines over 64K will crash the Copier with
bufio.ErrTooLong. Subsequently, the ioutils.bufReader will grow without
bound as the logs are no longer being flushed to disk.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: f779cfc5d8b8f0686c3849a3bd4ab0480675180d
Component: engine
2015-05-29 12:29:42 -04:00
4f2d3e6e12
Merge pull request #13574 from anchal-agrawal/13345-fix-mac-install-docs
...
Fixing Mac Boot2Docker installation doc Your fix has left the building.
Upstream-commit: 87d36079a79775c481a3483c2424cbecb1fbb887
Component: engine
2015-05-29 09:13:04 -07:00
7df85a8e31
Merge pull request #13563 from calavera/fix_bind_mount_regression
...
Mount bind volumes coming from the old volumes configuration.
Upstream-commit: 00b8d37084934c5389afe3fd5558c7694cde0593
Component: engine
2015-05-29 11:13:33 -04:00
995b2ea375
Add test coverage for pkg/stringutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6c36572e8b77bd7a4e8c1afa5be00fb4e7618c12
Component: engine
2015-05-29 15:49:29 +02:00
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
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
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
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
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
