Doug Davis
82ea6ed2bc
Allow .dockerignore to ignore everything
...
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.
Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.
Closes : #13417
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-30 04:16:00 -07:00
Jessie Frazelle
b21ef2d1d3
Merge pull request #13581 from s7v7nislands/fix_lxc_url
...
update lxc url
2015-05-29 11:48:44 -07:00
Alexander Morozov
6d8e517bce
Merge pull request #13482 from boucher/criu-libcontainer-update
...
Update vendored libcontainer
2015-05-29 10:28:58 -07:00
David Calavera
f1fed87fc0
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
2015-05-29 10:21:57 -07:00
Tianon Gravi
24d9edd8d1
Merge pull request #13585 from albers/completion-1.7
...
Update bash completion for 1.7.0
2015-05-29 09:43:44 -07:00
moxiegirl
87d36079a7
Merge pull request #13574 from anchal-agrawal/13345-fix-mac-install-docs
...
Fixing Mac Boot2Docker installation doc Your fix has left the building.
2015-05-29 09:13:04 -07:00
Brian Goff
00b8d37084
Merge pull request #13563 from calavera/fix_bind_mount_regression
...
Mount bind volumes coming from the old volumes configuration.
2015-05-29 11:13:33 -04:00
Doug Davis
34342e9cef
Merge pull request #13583 from vdemeester/pkg-timeutils-test-coverage
...
Add test coverage to pkg/timeutils
2015-05-29 09:35:34 -04:00
moxiegirl
059dc15ab9
Merge pull request #12773 from HuKeping/update-docs
...
Fix inconsistent of remote API and document
2015-05-29 06:27:15 -07:00
Hu Keping
22fda380a9
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-29 22:56:35 +08:00
Vincent Demeester
9aa8a590b7
Add test coverage to pkg/timeutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-29 15:09:35 +02:00
Harald Albers
b2832dffe5
Update bash completion for 1.7.0
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-05-29 12:42:59 +02:00
XiaoBing Jiang
2b69b326bc
update lxc url
...
Signed-off-by: XiaoBing Jiang <s7v7nislands@gmail.com >
2015-05-29 16:10:57 +08:00
Anchal Agrawal
27ffccf540
Fixing Mac Boot2Docker installation doc
...
Signed-off-by: Anchal Agrawal <aagrawa4@illinois.edu >
2015-05-28 22:53:54 -05:00
Jessie Frazelle
7f6a7973cd
Merge pull request #13566 from jfrazelle/fix-lxc-tests
...
skip test on lxc
2015-05-28 16:19:21 -07:00
Jessie Frazelle
fcdea09ea5
Merge pull request #13530 from jfrazelle/bump-api-version
...
bump api version to 1.20
2015-05-28 16:14:30 -07:00
David Calavera
7317b84ce0
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
2015-05-28 15:51:06 -07:00
Antonio Murdaca
e8c88d2533
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-29 00:42:11 +02:00
Jessica Frazelle
e76d0f5571
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-28 15:32:05 -07:00
moxiegirl
742a8a6cff
Merge pull request #13562 from moxiegirl/fixes-to-119-api
...
Fixes to the 1.19 version Thank you @thaJeztah and @jfrazelle!
2015-05-28 15:25:08 -07:00
Jessica Frazelle
1392f99a97
skip test on lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-28 14:54:12 -07:00
Mary Anthony
30901609a8
Fixes to the 1.19 version
...
updating with changes to this instant
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-28 14:25:26 -07:00
Jessie Frazelle
1f22676fcb
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
2015-05-28 14:15:34 -07:00
David Calavera
9292859fce
Add comment about ulimit format.
...
Fixes #12116
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-28 14:14:07 -07:00
David Calavera
53d9609de4
Mount bind volumes coming from the old volumes configuration.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-28 14:06:17 -07:00
Alexander Morozov
6f9fa64645
Treat systemd listeners as all other
...
Fix #13549
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-28 12:15:03 -07:00
Alexander Morozov
3bda841e3e
Merge pull request #13430 from runcom/fix-race-modify-request
...
Fix race in httpsRequestModifier.ModifyRequest when writing tlsConfig
2015-05-28 11:31:04 -07:00
David Calavera
37cc42ee0e
Merge pull request #13416 from Microsoft/10662-fixintegrationtests
...
Windows: Pass temp environment through
2015-05-28 11:22:37 -07:00
David Calavera
617a0c2fde
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
2015-05-28 11:09:02 -07:00
David Calavera
f99a962742
Merge pull request #13539 from tianon/deb-ubuntu-wily
...
Add Ubuntu Wily (15.10) as a build-deb target
2015-05-28 11:01:27 -07:00
David Calavera
24a0800d87
Merge pull request #13551 from albers/pgp-over-http
...
Use http for PGP key download
2015-05-28 10:59:14 -07:00
Jessie Frazelle
5bb6262d88
Merge pull request #13529 from hqhq/hq_skip_cgroup_test
...
Skip test if not have Cpu quota or Cpu period
2015-05-28 10:57:32 -07:00
David Calavera
85096cfd4f
Merge pull request #13512 from moysesb/progressreader_close_silently
...
Close progressreader silently when read is complete.
2015-05-28 10:54:08 -07:00
David Calavera
0256bbdebb
Merge pull request #13039 from stevenbrichards/13031-Upstart
...
Fix check for upstart not detecting properly
2015-05-28 10:38:55 -07:00
Alexander Morozov
b90732f801
Merge pull request #13548 from kvasdopil/zfs_magicnum
...
ZFS filesystem magic number check is fixed on FreeBSD
2015-05-28 10:27:12 -07:00
Moysés Borges
709fa2ad87
Modified progress reader to close silently when read is complete.
...
Closes #13432
Signed-off-by: Moysés Borges <moysesb@gmail.com >
2015-05-28 14:09:30 -03:00
Brian Goff
45488f9dc0
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
2015-05-28 12:59:57 -04:00
David Calavera
70bedc8ee5
Merge pull request #13538 from tianon/rpm-fedora-22
...
Add fedora:22 to our rpm targets
2015-05-28 09:55:09 -07:00
Steven Richards
e5ff643aed
Fixes #13031 - Check for upstart or init is not detecting properly
...
This will now properly check whether /etc/init.d/docker or service docker is
invoking the script and respond to the user accordingly.
Signed-off-by: Steven Richards <steven@axiomzen.co >
2015-05-28 09:52:05 -07:00
Brian Goff
27919bab2d
Merge pull request #13269 from Microsoft/10662-statsrefactor
...
Windows: refactor stats
2015-05-28 12:46:34 -04:00
Brian Goff
33c7c01a62
Merge pull request #13055 from Microsoft/10662-internalsfixperms
...
Windows: Fixup builder/internals.go
2015-05-28 12:31:45 -04:00
Brian Goff
a364dd8fc6
Merge pull request #13535 from coolljt0725/fix_automatically_publish_without_publish
...
Fix automatically publish ports without --publish-all or --publish
2015-05-28 11:49:53 -04:00
Alexey Guskov
36bf6e4440
zfs magicnumber check on freebsd is fixed
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-28 18:38:08 +03:00
Harald Albers
c1c5d760a6
Use http for PGP key download
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-05-28 16:43:36 +02:00
Brian Goff
ac7a33b45c
Merge pull request #13541 from coolljt0725/remove_reduntant_enter_create
...
Clean up: remove redundant '\n' in Create
2015-05-28 10:30:07 -04:00
Lei Jitang
bcd076b5fe
Clean up: remove redundant '\n' in Create
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-28 17:08:55 +08:00
Tianon Gravi
38c77ba876
Add Ubuntu Wily (15.10) as a build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-28 01:06:11 -07:00
Tianon Gravi
96903c837f
Add fedora:22 to our rpm targets
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-28 01:01:45 -07:00
Sebastiaan van Stijn
7011d9ee8a
Merge pull request #13515 from lloydde/doc-cli-lint
...
doc cli lint.
2015-05-28 09:13:25 +02:00
Qiang Huang
34e5b6af19
Skip test if not have Cpu quota or Cpu period
...
Closes : #13522
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-28 14:59:58 +08:00