Antonio Murdaca
6945ac2d02
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-03 23:13:56 +02:00
Arnaud Porterie
ad56d797d3
Merge pull request #13712 from LK4D4/fix_leak_events
...
Support CloseNotifier for events
2015-06-03 13:43:39 -07:00
Antonio Murdaca
f18ce101fb
Merge pull request #13165 from ahmetalpbalkan/durations
...
Allow duration strings as --since/--until
2015-06-03 22:14:42 +02:00
Arnaud Porterie
a29633f687
Merge pull request #13703 from runcom/13691-container-ps-regression
...
Do not omit empty json field in /containers/json api response
2015-06-03 12:30:12 -07:00
Sebastiaan van Stijn
b30121984e
Merge pull request #13702 from BenSeverson/patch-1
...
quick doc fix for windows versions
2015-06-03 21:24:13 +02:00
David Calavera
c962f53a3e
Merge pull request #13645 from calavera/fix_stats_flaky_test
...
Fix stats flaky test.
2015-06-03 12:05:43 -07:00
Alexander Morozov
9e7fc245a7
Support CloseNotifier for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-03 11:42:51 -07:00
Ben Severson
a448b7aff2
quick doc fix for windows versions
...
Signed-off-by: Ben Severson <BenSeverson@users.noreply.github.com>
2015-06-03 10:28:11 -07:00
Alexander Morozov
521926f6c4
Merge pull request #13231 from Microsoft/10662-chrootarchive
...
Windows: chrootarchive refactor
2015-06-03 09:54:42 -07:00
Antonio Murdaca
725f34151c
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-03 18:53:40 +02:00
Sebastiaan van Stijn
0636bb7b73
Merge pull request #13672 from LK4D4/syslog_tag
...
Add syslog-tag option
2015-06-03 17:04:59 +02:00
moxiegirl
641f3e0932
Merge pull request #13205 from hqhq/hq_fix_ipforward_doc
...
Add docs for ip-forward
2015-06-03 07:50:19 -07:00
Antonio Murdaca
f03daf29dc
Merge pull request #13696 from hqhq/hq_add_comment_inspect
...
Add comment about inspect output
2015-06-03 13:36:00 +02:00
Qiang Huang
01a9a9284f
Add comment about inspect output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-06-03 17:35:57 +08:00
Qiang Huang
85fffe1341
Add docs for ip-forward
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-06-03 16:37:40 +08:00
Jessie Frazelle
63823cd6c1
Merge pull request #13683 from crosbymichael/nat-test-fixes
...
Fix nat integration tests
2015-06-02 18:54:17 -07:00
Michael Crosby
4f42097883
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>
2015-06-02 18:21:16 -07:00
Jessie Frazelle
25376c652d
Merge pull request #13679 from icecrime/update_vendoring
...
Update vendoring
2015-06-02 17:41:48 -07:00
Arnaud Porterie
1664d6cd66
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-06-02 16:41:02 -07:00
David Calavera
af09b06dfa
Merge pull request #13675 from runcom/13663-config-regression
...
Expose old config field for api < 1.19
2015-06-02 15:23:51 -07:00
Antonio Murdaca
6deaa58ba5
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-06-02 23:37:59 +02:00
David Calavera
6c42b3947a
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
2015-06-02 14:12:22 -07:00
Alexander Morozov
3f26066425
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
2015-06-02 14:05:29 -07:00
Ahmet Alp Balkan
4e3b21f99e
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>
2015-06-02 21:02:47 +00:00
Doug Davis
da255ec962
Merge pull request #13661 from vdemeester/pkg-jsonmessage-test-coverage
...
Add test coverage to pkg/jsonmessage
2015-06-02 16:54:50 -04:00
Sebastiaan van Stijn
7e8639a9df
Merge pull request #13671 from moxiegirl/carry-13147-fix
...
Tweaking text identified in PR #13147
2015-06-02 21:48:47 +02:00
Alexander Morozov
3df19749d4
Wrap lines for journald docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-02 12:46:51 -07:00
Mary Anthony
cb4af853f6
Tweaking text identified in PR #13147
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-02 12:44:47 -07:00
Alexander Morozov
8979fe4d8a
Change address to syslog-address in syslog docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-02 12:44:23 -07:00
Alexander Morozov
a81af2e26a
Add syslog-tag option for syslog log-driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-02 12:43:00 -07:00
Vincent Demeester
e6bd8c1e19
Add test coverage to pkg/jsonmessage
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-06-02 21:19:38 +02:00
Phil Estes
63b5d5fadc
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
2015-06-02 15:04:38 -04:00
David Calavera
ad244668c3
Update libnetwork to 4ded6fe3641b71863cc5985652930ce40efc3af4
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-02 11:30:36 -07:00
Phil Estes
278798236b
Merge pull request #13650 from jvgogh/master
...
Upon HTTP 302 redirect do not include "Authorization" header on 'untr…
2015-06-02 14:23:20 -04:00
Arnaud Porterie
274baf70bf
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
2015-06-02 11:16:23 -07:00
Jessie Frazelle
7d33bc0bec
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
2015-06-02 11:05:22 -07:00
David Calavera
ad41efd9a2
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-02 11:00:54 -07:00
David Calavera
814a92c5a1
Merge pull request #13607 from vieux/PrintfIfNotEmpty
...
do not print empty values in docker info
2015-06-02 10:52:45 -07:00
Sebastiaan van Stijn
bdb6fad34c
Merge pull request #13654 from porjo/netipv6
...
Networking docs: add reference to ndppd
2015-06-02 19:06:17 +02:00
Arnaud Porterie
2de2782fe8
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
2015-06-02 09:40:55 -07:00
Alexander Morozov
9f098cabfc
Merge pull request #13664 from runcom/dead-code
...
Remove old struct
2015-06-02 09:37:55 -07:00
Sebastiaan van Stijn
fbadf11d20
Merge pull request #13633 from ZJU-SEL/fix-doc
...
fix typo.
2015-06-02 18:36:52 +02:00
Antonio Murdaca
39eec4c25b
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
2015-06-02 18:01:19 +02:00
Vincent Batts
d13af493f8
Merge pull request #13630 from vdemeester/pkg-tarsum-test-coverage
...
Add test coverage for pkg/tarsum
2015-06-02 11:44:42 -04:00
Phil Estes
8a11b40fea
Merge pull request #13553 from Microsoft/10662-revert908db
...
Windows: Undo 908db518
for Windows daemon
2015-06-02 10:22:39 -04:00
Antonio Murdaca
da1a77defd
Remove old struct
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
2015-06-02 16:10:39 +02:00
James Turnbull
879f0fb338
Merge pull request #13657 from chriswahl/patch-1
...
Corrected VMWare to VMware
2015-06-02 07:41:25 -04:00
Alexey Guskov
ea5ce27564
update go-zfs to last version
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-06-02 10:37:38 +03:00
Vincent Demeester
25f7d7822d
Add test coverage for pkg/tarsum
...
And removing unused code.
- tarsum.go :
NewTarSumHash could be non exported (for now)
NewTarSumForLabel is never used, except for the tests
- fileinfosums.go:
SortByPos is never used, except for the tests
- versionning.go:
GetVersions is never used, expect for the tests
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-06-02 09:08:01 +02:00
Ian Bishop
b1a1cff368
Networking docs: add reference to ndppd
...
Signed-off-by: Ian Bishop <ianbishop@pace7.com>
2015-06-02 15:56:24 +10:00