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
059dc15ab9
Merge pull request #12773 from HuKeping/update-docs
...
Fix inconsistent of remote API and document
2015-05-29 06:27:15 -07:00
22fda380a9
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-29 22:56:35 +08:00
9aa8a590b7
Add test coverage to pkg/timeutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-29 15:09:35 +02:00
7f6a7973cd
Merge pull request #13566 from jfrazelle/fix-lxc-tests
...
skip test on lxc
2015-05-28 16:19:21 -07:00
fcdea09ea5
Merge pull request #13530 from jfrazelle/bump-api-version
...
bump api version to 1.20
2015-05-28 16:14:30 -07:00
7317b84ce0
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
2015-05-28 15:51:06 -07:00
e76d0f5571
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-28 15:32:05 -07:00
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
1392f99a97
skip test on lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-28 14:54:12 -07:00
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
1f22676fcb
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
2015-05-28 14:15:34 -07:00
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
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
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
37cc42ee0e
Merge pull request #13416 from Microsoft/10662-fixintegrationtests
...
Windows: Pass temp environment through
2015-05-28 11:22:37 -07:00
617a0c2fde
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
2015-05-28 11:09:02 -07:00
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
24a0800d87
Merge pull request #13551 from albers/pgp-over-http
...
Use http for PGP key download
2015-05-28 10:59:14 -07:00
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
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
0256bbdebb
Merge pull request #13039 from stevenbrichards/13031-Upstart
...
Fix check for upstart not detecting properly
2015-05-28 10:38:55 -07:00
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
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
45488f9dc0
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
2015-05-28 12:59:57 -04:00
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
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
27919bab2d
Merge pull request #13269 from Microsoft/10662-statsrefactor
...
Windows: refactor stats
2015-05-28 12:46:34 -04:00
33c7c01a62
Merge pull request #13055 from Microsoft/10662-internalsfixperms
...
Windows: Fixup builder/internals.go
2015-05-28 12:31:45 -04:00
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
36bf6e4440
zfs magicnumber check on freebsd is fixed
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-05-28 18:38:08 +03:00
c1c5d760a6
Use http for PGP key download
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-28 16:43:36 +02:00
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
bcd076b5fe
Clean up: remove redundant '\n' in Create
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-28 17:08:55 +08:00
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
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
7011d9ee8a
Merge pull request #13515 from lloydde/doc-cli-lint
...
doc cli lint.
2015-05-28 09:13:25 +02:00
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
15b45113eb
Merge pull request #13532 from jfrazelle/fix-fix-release-script
...
fix release script
2015-05-27 23:17:45 -06:00
9f619282db
fix release script
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-27 20:57:46 -07:00
2daede5a9c
Merge pull request #13374 from RichardScothern/v2-mirror
...
V2 mirror support
2015-05-27 21:15:26 -04:00
c2e8f07a05
Merge pull request #13518 from mrjana/clone
...
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
2015-05-27 17:42:10 -07:00
e817e08481
Review feedback:
...
- Match verbiage with other output
- Remove dead code and clearer flow
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-05-27 17:29:24 -07:00
d429465b37
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-28 00:04:01 +00:00
c9d3681a5d
Merge pull request #13477 from kvasdopil/freebsd-build
...
Make hack/make.sh work on FreeBSD
2015-05-27 17:42:49 -06:00
49e734c6e4
Merge pull request #13496 from Microsoft/10662-windefaults
...
Windows: Set default exec driver to windows
2015-05-27 16:02:24 -07:00
f6f7d35248
Restore the stripped registry version number
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-05-27 15:15:47 -07:00
b4a52fc4e9
doc cli lint.
...
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
2015-05-27 15:07:57 -07:00
ec471a7c9b
Merge pull request #12572 from jfrazelle/selinux-labels-carry
...
Modify volume mounts SELinux labels on the fly based on :Z or :z
2015-05-27 14:46:16 -07:00
b2a43baf2e
Use SELinux labels for volumes
...
Fixes a regression from the volumes refactor where the vfs graphdriver
was setting labels for volumes to `s0` so that they can both be written
to by the container and shared with other containers.
When moving away from vfs this was never re-introduced.
Since this needs to happen regardless of volume driver, this is
implemented outside of the driver.
Fixes issue where `z` and `Z` labels are not set for bind-mounts.
Don't lock while creating volumes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-27 13:43:38 -07:00
Doug Davis
moxiegirl
Hu Keping
Vincent Demeester
Jessie Frazelle
David Calavera
Jessica Frazelle
Alexander Morozov
Alexander Morozov
Moysés Borges
Brian Goff
Steven Richards
Alexey Guskov
Harald Albers
Lei Jitang
Tianon Gravi
Sebastiaan van Stijn
Qiang Huang
Tibor Vass
Arnaud Porterie
Richard
Jana Radhakrishnan
Lloyd Dewolf