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
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
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
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
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
3c84994047
Merge pull request #13675 from runcom/13663-config-regression
...
Expose old config field for api < 1.19
Upstream-commit: af09b06dfa7caa888e8f8f8c85a9da8b3ab20255
Component: engine
2015-06-02 15:23:51 -07:00
5276323624
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6deaa58ba5f051039643cedceee97c8695e2af74
Component: engine
2015-06-02 23:37:59 +02:00
0fb31101e8
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
Upstream-commit: 6c42b3947a6ad91fc487ba34fec634e9f5c48aea
Component: engine
2015-06-02 14:12:22 -07:00
91a00ec5ad
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
Upstream-commit: 3f26066425a308407054303e9e12ba1c1c743552
Component: engine
2015-06-02 14:05:29 -07:00
add0a8eb5b
Allow duration strings as --since/--until
...
Fixes #13107 . This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.
Added unit tests for pkg/timeutils.GetTimestamp as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 4e3b21f99e7fb7fac0075be2e7190d5f07c9ee66
Component: engine
2015-06-02 21:02:47 +00:00
fc9089bc0b
Merge pull request #13661 from vdemeester/pkg-jsonmessage-test-coverage
...
Add test coverage to pkg/jsonmessage
Upstream-commit: da255ec962e26491baceffdc230fac3561396ff8
Component: engine
2015-06-02 16:54:50 -04:00
b508114358
Wrap lines for journald docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3df19749d420b1fae07cb4d7c5b61fbb53b15fa9
Component: engine
2015-06-02 12:46:51 -07:00
21fa65b4fd
Tweaking text identified in PR #13147
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: cb4af853f62d1e615f5d5ba62139ad5ed7bed5d5
Component: engine
2015-06-02 12:44:47 -07:00
075ef85626
Change address to syslog-address in syslog docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8979fe4d8a11d5f38e09e4acc6268c56d40ef151
Component: engine
2015-06-02 12:44:23 -07:00
f8248bbabf
Add syslog-tag option for syslog log-driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a81af2e26a19cca0ffb8cbfa619169d55d604789
Component: engine
2015-06-02 12:43:00 -07:00
29754ab635
Add test coverage to pkg/jsonmessage
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e6bd8c1e19f62fd3d09df37cd1712fd7e96bba89
Component: engine
2015-06-02 21:19:38 +02:00
bd2c53758a
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
Upstream-commit: 63b5d5fadc9fa6ac9dd93c8553030d84e7ac741f
Component: engine
2015-06-02 15:04:38 -04:00
01c69f98c5
Update libnetwork to 4ded6fe3641b71863cc5985652930ce40efc3af4
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ad244668c3db521626e65fd9c2a4468f35a7b0bc
Component: engine
2015-06-02 11:30:36 -07:00
3494783c1d
Merge pull request #13650 from jvgogh/master
...
Upon HTTP 302 redirect do not include "Authorization" header on 'untr…
Upstream-commit: 278798236bdf073dd7c66e32e21d81bbf9243656
Component: engine
2015-06-02 14:23:20 -04:00
49338919a2
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
Upstream-commit: 274baf70bf806678d12adc1e1de2c8d7774de645
Component: engine
2015-06-02 11:16:23 -07:00
85f67e34a6
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
Upstream-commit: 7d33bc0bec14cedff0829a3e77c029c875413ec0
Component: engine
2015-06-02 11:05:22 -07:00
0ec0ea6ec1
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ad41efd9a271998620e04602ade71a94b4b0e7e4
Component: engine
2015-06-02 11:00:54 -07:00
7eb8a02dc4
Merge pull request #13607 from vieux/PrintfIfNotEmpty
...
do not print empty values in docker info
Upstream-commit: 814a92c5a1745879156ac9ab18569a9d1bc1b1a9
Component: engine
2015-06-02 10:52:45 -07:00
e427ed126a
Merge pull request #13654 from porjo/netipv6
...
Networking docs: add reference to ndppd
Upstream-commit: bdb6fad34cba055c6c7d58851c96dba485e10216
Component: engine
2015-06-02 19:06:17 +02:00
35a3ad8b0c
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
Upstream-commit: 2de2782fe89cf2793e868161985a3d7f764520df
Component: engine
2015-06-02 09:40:55 -07:00
e369cfae8c
Merge pull request #13664 from runcom/dead-code
...
Remove old struct
Upstream-commit: 9f098cabfc92db90ff66d9a1b318c0b5872edcbd
Component: engine
2015-06-02 09:37:55 -07:00
