9eb2d545d0
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0adfb908a682e679b54f511fe89e668d6e676dda
Component: engine
2015-06-05 09:50:30 -07:00
87aa2e6ea1
Merge pull request #13752 from tianon/fix-release-debs
...
Fix release script to release _both_ .deb files
Upstream-commit: cd1a1ee9729f76789194a5b5f6dcbc7fa7282420
Component: engine
2015-06-04 16:37:59 -07:00
877de25418
Merge pull request #13640 from Microsoft/10662-implementmeminfo
...
Windows: Implement ReadMemInfo()
Upstream-commit: e33aeac70892b2088442fc146fb16ab59b4eb58c
Component: engine
2015-06-04 16:09:24 -07:00
605f84f177
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 4572329d4b1d7b4f9cb638961a299f79443506bb
Component: engine
2015-06-04 16:08:12 -07:00
649fae7e21
Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output
...
registry: debugTransport should print with testing.T.Log
Upstream-commit: a06e0bb8b49819402180331d325d919f865a5fbd
Component: engine
2015-06-05 00:42:22 +02:00
02d7f238fb
Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info
...
Cleanup Daemon.verifyVolumesInfo() a bit
Upstream-commit: a2602c617d0afcf829983c46abd9cc95f2003078
Component: engine
2015-06-04 15:39:31 -07:00
de132e9aef
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
Upstream-commit: b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Component: engine
2015-06-04 12:05:47 -07:00
6f075808ca
Merge pull request #13728 from calavera/copy_old_volume_content
...
Migrate data from old vfs paths to new local volumes path.
Upstream-commit: b26428257f211f21f0f93d27d0ea74531cda9047
Component: engine
2015-06-04 11:14:34 -07:00
c9c1615d1c
Merge pull request #13736 from SvenDowideit/double-the-double-the-lines
...
Tiny spelling issue in the debian control file :)
Upstream-commit: 7c2178b3582729489f09fdce6aee28d2238ac047
Component: engine
2015-06-04 11:10:55 -07:00
28c1c16a45
Merge pull request #13745 from icecrime/test_import_path
...
Fix kr/pty import path in test-integration-cli
Upstream-commit: cbe120db587cddc8af9885e9ff2f2a69040deb4e
Component: engine
2015-06-04 10:59:37 -07:00
148ef92617
Migrate data from old vfs paths to new local volumes path.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 16a5590c5be4be555a1ebe52d031d4e9e0e6da23
Component: engine
2015-06-04 10:16:19 -07:00
3ff75591ad
Merge pull request #13586 from kvasdopil/zfs-88chars
...
Avoid 88-chars mountpoint length limit on freebsd
Upstream-commit: 9069cded5761de31b786d70f269fa47732e3e5ed
Component: engine
2015-06-04 10:05:01 -07:00
a2241b3c00
Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir
...
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
Upstream-commit: 2c09dbb7ddab685d52a2748e6f78fc8e90ad4469
Component: engine
2015-06-04 09:21:53 -07:00
dc2974419c
Merge pull request #13716 from moxiegirl/move-experimental
...
Moving experimental
Upstream-commit: 4efedb3fba49623de562b189a145c8334eaba609
Component: engine
2015-06-04 09:11:00 -07:00
cd63c659d6
Fix kr/pty import path
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9ec5e4f7df15f5c1e9862f71fe3079188fff0106
Component: engine
2015-06-04 09:02:14 -07:00
10ccc11e11
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
...
Also remove redundant code.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: d31224743b31b3e29ed7df0835193ff1ac4e723c
Component: engine
2015-06-04 21:26:15 +08:00
e4dcd8eb99
Tiny spelling issue in the debian control file :)
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 318defe1de8a9d2930d784306fd024c59e21a8c5
Component: engine
2015-06-04 18:16:24 +10:00
bda4b578b4
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ea180a73bc00491915d620c14877318cc33b2a73
Component: engine
2015-06-03 23:39:27 -07:00
4e0d41c20f
Merge pull request #13704 from tianon/build-utc
...
Swap build-* to use UTC instead of local time
Upstream-commit: ef3e956aa2c8b24fd18c7fa693b366be781fc30a
Component: engine
2015-06-03 22:05:09 -07:00
7f16e8246b
Merge pull request #13732 from mavenugo/netdisabled
...
Using container NetworkDisabled to fix #13725
Upstream-commit: 57bba29f7910e0fe7d99ecb6375d7c56fd1812bf
Component: engine
2015-06-03 21:40:15 -07:00
8b93ea90be
Using container NetworkDisabled to fix #13725
...
container.config.NetworkDisabled is set for both daemon's
DisableNetwork and --networking=false case. Hence using
this flag instead to fix #13725 .
There is an existing integration-test to catch this issue,
but it is working for the wrong reasons.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 83208a531d1824ea7b0a55f9419e915e446c780a
Component: engine
2015-06-03 17:31:22 -07:00
d446c85a16
Merge pull request #13731 from jfrazelle/fix-version-on-old-versions
...
fix version struct on old versions
Upstream-commit: f37e6e180f67db73e8db9f3eaebb84a42fc01914
Component: engine
2015-06-03 17:24:53 -07:00
c288a52d40
Merge pull request #13718 from runcom/fix-containers-json
...
SizeRW & SizeRootFs omitted if empty in /container/json call
Upstream-commit: fdd6175bca8bcd2a189e18964ec3e92645ee73c3
Component: engine
2015-06-03 17:14:58 -07:00
736776362e
fix version struct on old versions
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 229b599259b24b30fdecbb70bdbba417a81e9723
Component: engine
2015-06-03 16:56:50 -07:00
f3c5fa17d3
Merge pull request #13715 from LK4D4/update_logrus
...
Update github.com/Sirupsen/logrus to 0.8.2
Upstream-commit: babf751e1b96641ffd643b32394bf57e2de6c609
Component: engine
2015-06-03 14:24:37 -07:00
fd2e1a1b2e
Merge pull request #13709 from jfrazelle/update-url
...
Update urls from .com to .org.
Upstream-commit: ca66419522a40b86ece75b0eb044d6d394acacec
Component: engine
2015-06-03 14:21:38 -07:00
e28afd6060
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 6945ac2d02adbe2931c9e8756ecbb7496b43081a
Component: engine
2015-06-03 23:13:56 +02:00
10b1c5b724
Merge pull request #13712 from LK4D4/fix_leak_events
...
Support CloseNotifier for events
Upstream-commit: ad56d797d3cbac8d02fe2542f5673bbdd3d862b8
Component: engine
2015-06-03 13:43:39 -07:00
f66c6560f0
Moving experimental
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 95dfc4c4a545c3ca35ad7582bbfe4a627bd6a5fc
Component: engine
2015-06-03 13:43:27 -07:00
961db33814
Update urls from .com to .org.
...
I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 7943bce8942ee8c262180652951216d963fa6202
Component: engine
2015-06-03 13:28:47 -07:00
7dcd58c0ec
Update github.com/Sirupsen/logrus to 0.8.2
...
Fix #13708
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: fa020341e46cfe127b1e1124aa482651aecde359
Component: engine
2015-06-03 13:22:56 -07:00
2d31933cd6
Merge pull request #13165 from ahmetalpbalkan/durations
...
Allow duration strings as --since/--until
Upstream-commit: f18ce101fbdf6c62a5643f826ed69a8abb843d87
Component: engine
2015-06-03 22:14:42 +02:00
cc362d8cba
Merge pull request #13703 from runcom/13691-container-ps-regression
...
Do not omit empty json field in /containers/json api response
Upstream-commit: a29633f6878369081dcdb9886ca7e24a082d0393
Component: engine
2015-06-03 12:30:12 -07:00
1421c0bf70
Merge pull request #13702 from BenSeverson/patch-1
...
quick doc fix for windows versions
Upstream-commit: b30121984e500ce7555a0aa10cdf17b2a5261cf4
Component: engine
2015-06-03 21:24:13 +02:00
26bf655315
Merge pull request #13645 from calavera/fix_stats_flaky_test
...
Fix stats flaky test.
Upstream-commit: c962f53a3e66dcfaf6c335df805d99cb5784245f
Component: engine
2015-06-03 12:05:43 -07:00
30f311bc4f
Support CloseNotifier for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9e7fc245a79535984c3e0dd3d2c4f042e92cdc6a
Component: engine
2015-06-03 11:42:51 -07:00
f597f6e48c
quick doc fix for windows versions
...
Signed-off-by: Ben Severson <BenSeverson@users.noreply.github.com >
Upstream-commit: a448b7aff266545b793a49307764cf1a4a736ab9
Component: engine
2015-06-03 10:28:11 -07:00
77c62581e8
Swap build-* to use UTC instead of local time
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: aa54a93f749e2048957eb28e6045770672cb8838
Component: engine
2015-06-03 09:56:46 -07:00
84b3be115b
Merge pull request #13231 from Microsoft/10662-chrootarchive
...
Windows: chrootarchive refactor
Upstream-commit: 521926f6c4238c8f5d26adccbe5052dad8a70245
Component: engine
2015-06-03 09:54:42 -07:00
90d04ee342
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 725f34151c5f86b0b50f6e5601223e6da194af1b
Component: engine
2015-06-03 18:53:40 +02:00
d61059b14c
Merge pull request #13672 from LK4D4/syslog_tag
...
Add syslog-tag option
Upstream-commit: 0636bb7b73f49979f8def3d950c5e1d43a602695
Component: engine
2015-06-03 17:04:59 +02:00
a732ba8075
Merge pull request #13205 from hqhq/hq_fix_ipforward_doc
...
Add docs for ip-forward
Upstream-commit: 641f3e0932920dcc394179f76e2d7f64e29b2a2a
Component: engine
2015-06-03 07:50:19 -07:00
c44ab32041
Merge pull request #13696 from hqhq/hq_add_comment_inspect
...
Add comment about inspect output
Upstream-commit: f03daf29dc311daee23deb75a770c1289f9abbe4
Component: engine
2015-06-03 13:36:00 +02:00
63f811604a
Add comment about inspect output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 01a9a9284fd0082edead2ea6eaa01d152f7f4157
Component: engine
2015-06-03 17:35:57 +08:00
4ced50e635
Add docs for ip-forward
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 85fffe1341fc4e957a9a40dbc3cedded8cb44e70
Component: engine
2015-06-03 16:37:40 +08:00
4248457bc0
Merge pull request #13683 from crosbymichael/nat-test-fixes
...
Fix nat integration tests
Upstream-commit: 63823cd6c103efc2f71d64aa3834112b6ddc9fad
Component: engine
2015-06-02 18:54:17 -07:00
376792022a
Fix nat integration tests
...
This removes complexity of current implementation and makes the test
correct and assert the right things.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4f4209788378e580247d4baff65ae5b58afac4ba
Component: engine
2015-06-02 18:21:16 -07:00
3cf411b6db
Cleanup Daemon.verifyVolumesInfo() a bit
...
vols.VolumesRW has been initialized so it can't be nil. Furthermore
it's ok to read a nil map.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: 8b4c0decfc6a3ef748a70c2f53d1351d5aa8ab64
Component: engine
2015-06-03 09:19:16 +08:00
8eb2968395
Merge pull request #13679 from icecrime/update_vendoring
...
Update vendoring
Upstream-commit: 25376c652ddf2f7c1aade9dc6624aaba2ba1a734
Component: engine
2015-06-02 17:41:48 -07:00
5ce5df9c4d
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 1664d6cd66c48dce5628cb67c1bdf5c7c2395d53
Component: engine
2015-06-02 16:41:02 -07:00
