beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16024 commits 14 branches 412 tags 338 MiB
Commit graph

16024 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
0c84604f54 Fix goroutine leak on logs -f with no output 
Also noticed potential hang when only stdout or stderr are used with
follow=1

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-04 13:56:40 -07:00
Alexander Morozov
cbe120db58 Merge pull request #13745 from icecrime/test_import_path 
Fix kr/pty import path in test-integration-cli
 2015-06-04 10:59:37 -07:00
Alexander Morozov
9069cded57 Merge pull request #13586 from kvasdopil/zfs-88chars 
Avoid 88-chars mountpoint length limit on freebsd
 2015-06-04 10:05:01 -07:00
David Calavera
2c09dbb7dd Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir 
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
 2015-06-04 09:21:53 -07:00
moxiegirl
4efedb3fba Merge pull request #13716 from moxiegirl/move-experimental 
Moving experimental
 2015-06-04 09:11:00 -07:00
Arnaud Porterie
9ec5e4f7df Fix kr/pty import path 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-06-04 09:02:14 -07:00
Zefan Li
d31224743b Don't forget to clenaup tmpdir in TestFileSpecPlugin() 
Also remove redundant code.

Signed-off-by: Zefan Li <lizefan@huawei.com>
 2015-06-04 21:26:15 +08:00
Jessie Frazelle
ef3e956aa2 Merge pull request #13704 from tianon/build-utc 
Swap build-* to use UTC instead of local time
 2015-06-03 22:05:09 -07:00
Arnaud Porterie
57bba29f79 Merge pull request #13732 from mavenugo/netdisabled 
Using container NetworkDisabled to fix #13725
 2015-06-03 21:40:15 -07:00
Madhu Venugopal
83208a531d 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>
 2015-06-03 17:31:22 -07:00
Arnaud Porterie
f37e6e180f Merge pull request #13731 from jfrazelle/fix-version-on-old-versions 
fix version struct on old versions
 2015-06-03 17:24:53 -07:00
Jessie Frazelle
fdd6175bca Merge pull request #13718 from runcom/fix-containers-json 
SizeRW & SizeRootFs omitted if empty in /container/json call
 2015-06-03 17:14:58 -07:00
Jessica Frazelle
229b599259 fix version struct on old versions 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-03 16:56:50 -07:00
Arnaud Porterie
babf751e1b Merge pull request #13715 from LK4D4/update_logrus 
Update github.com/Sirupsen/logrus to 0.8.2
 2015-06-03 14:24:37 -07:00
Jessie Frazelle
ca66419522 Merge pull request #13709 from jfrazelle/update-url 
Update urls from .com to .org.
 2015-06-03 14:21:38 -07:00
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
Mary Anthony
95dfc4c4a5 Moving experimental 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-03 13:43:27 -07:00
Jessica Frazelle
7943bce894 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>
 2015-06-03 13:28:47 -07:00
Alexander Morozov
fa020341e4 Update github.com/Sirupsen/logrus to 0.8.2 
Fix #13708

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-03 13:22:56 -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
Tianon Gravi
aa54a93f74 Swap build-* to use UTC instead of local time 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-03 09:56:46 -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