Ma Shimiao
8d4c0ba274
opts/weightdevice: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-19 17:03:46 +08:00
Michael Crosby
877fe61f75
Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all
...
Remove the container initializers per platform.
2015-11-18 14:06:47 -08:00
Michael Crosby
0d2ea52f03
Merge pull request #18030 from Microsoft/sjw/pull_id_hack
...
[TP4] Windows: hacking around content addressable IDs for temporary fix.
2015-11-18 11:08:13 -08:00
moxiegirl
ec72163949
Merge pull request #18069 from vdemeester/fix-volume-doc-typo
...
Fix a small typo in volume_inspect.md
2015-11-18 10:14:15 -08:00
Vincent Demeester
a96be2930a
Fix a small typo in volume_inspect.md
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-18 16:02:24 +01:00
David Calavera
060f4ae617
Remove the container initializers per platform.
...
By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-18 08:41:46 -05:00
David Calavera
0780ad4857
Merge pull request #17973 from moxiegirl/fix-networking-issue
...
Fixing issue noted by user
2015-11-18 12:49:11 +01:00
David Calavera
3f5e5b8f57
Merge pull request #17992 from nak3/fix-wrong-setting-in-systemd
...
Fix invalid proxy setting example
2015-11-18 12:48:41 +01:00
David Calavera
1b1af308da
Merge pull request #18059 from QuentinPerez/typo
...
Fix typo in ARM.md
2015-11-18 12:46:19 +01:00
David Calavera
080b3e7527
Merge pull request #18062 from svetlyak40wt/patch-1
...
Fix header levels for 1.9 release notes
2015-11-18 12:45:24 +01:00
Antonio Murdaca
927d0be4d8
Merge pull request #18050 from LK4D4/simple_err_registry
...
registry/registry.go: simplify logical expression
2015-11-18 11:51:55 +01:00
Alexander Artemenko
4cef3477b5
Fix header levels for 1.9 release notes
...
This way, parsers like allmychanges.com will be able to extract structured information about release
Signed-off-by: Alexander Artemenko <svetlyak.40wt@gmail.com>
2015-11-18 12:53:48 +03:00
David Calavera
7179c89943
Merge pull request #18046 from LK4D4/carry_16822
...
Revert AppArmor skip tests
2015-11-18 10:37:53 +01:00
David Calavera
33d9ae358c
Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
...
zsh: ensure we have enough commands to store in the cache
2015-11-18 10:36:32 +01:00
David Calavera
5d53e39c02
Merge pull request #18056 from vincentbernat/fix/zsh-no-lxc
...
zsh: remove lxc-related completion
2015-11-18 10:35:59 +01:00
David Calavera
57b42250ce
Merge pull request #17991 from nak3/proxy-env
...
docker info suppports case-insensitive proxy env settings
2015-11-18 10:35:06 +01:00
David Calavera
db08adb5cb
Merge pull request #18004 from Gobella/master
...
update docker_cli_pull_trusted_test.go
2015-11-18 10:32:28 +01:00
Quentin Perez
25cfa80119
Fix typo in ARM.md
...
Signed-off-by: Quentin Perez <qperez@ocs.online.net>
2015-11-18 09:46:39 +01:00
Vincent Bernat
8105a3a366
zsh: remove lxc-related completion
...
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334 .
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-11-18 08:13:03 +01:00
Vincent Bernat
61564bcb5f
zsh: ensure we have enough commands to store in the cache
...
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-11-18 08:08:43 +01:00
Kenjiro Nakayama
84781a5df7
docker info suppports case-insensitive proxy env settings
...
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
2015-11-18 10:58:19 +09:00
Alexander Morozov
c00c64c20e
Merge pull request #18047 from aaronlehmann/push-fix
...
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
2015-11-17 17:03:13 -08:00
moxiegirl
c83373112c
Merge pull request #17986 from bogdangrigg/master
...
Fix small typos in documentation files
2015-11-17 16:45:38 -08:00
moxiegirl
2ee56ce1e1
Merge pull request #18011 from lrkwz/patch-1
...
Update ubuntulinux.md
2015-11-17 16:44:33 -08:00
Michael Crosby
3f508f08de
Merge pull request #17261 from mountkin/remove-unused-daemon-config
...
remove the unused DefaultNetwork member from daemon.Config
2015-11-17 16:33:11 -08:00
Alexander Morozov
662b9623c1
Merge pull request #17866 from shekhargulati/patch-1
...
added rx-docker-client library
2015-11-17 16:15:15 -08:00
Alexander Morozov
90e2459ecb
registry/registry.go: simplify logical expression
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-17 16:12:11 -08:00
Alexander Morozov
e2417e3e92
Merge pull request #17617 from askb/17168_pull_error_fix
...
Fix for #17168 issue
2015-11-17 16:10:44 -08:00
Aaron Lehmann
0ab6b1d922
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
...
This fixes an issue where two images with the same filesystem contents
and configuration but different remote IDs could share a v1Compatibility
file, resulting in corrupted manifests.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-17 16:05:09 -08:00
Alexander Morozov
a935359ec7
Merge pull request #17294 from zhangjianfnst/16756-integration-cli-checkers-cp
...
Use checker assert for integration-cli/docker_cli_cp_* four files.
2015-11-17 16:00:00 -08:00
Alexander Morozov
92ea146790
Merge pull request #17452 from aditirajagopal/16756-docker_cli_by_digest_test
...
Checkers on docker_cli_by_digest_test
2015-11-17 15:58:05 -08:00
Alexander Morozov
346d195f6a
Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
...
Add zsh completion for log options
2015-11-17 15:53:31 -08:00
Michael Crosby
53556183c7
Merge pull request #17434 from little-arhat/fix/newlines-in-json-status
...
Add newlines to FormatProgress for JSON as well
2015-11-17 15:52:31 -08:00
Michael Crosby
104dab87ea
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
2015-11-17 15:44:57 -08:00
Alexander Morozov
adce1981f4
Merge pull request #17593 from daehyeok/refactoring_json_log
...
Refactoring json log driver
2015-11-17 15:38:52 -08:00
Michael Crosby
ca0b41e337
Merge pull request #18000 from daehyeok/fix_dry_run_test
...
Modified cpuset test for unicore test environment
2015-11-17 15:15:09 -08:00
Michael Crosby
7147ac6ce7
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
2015-11-17 15:12:08 -08:00
Stefan J. Wernli
d860ff79a0
Windows: hacking around content addressable IDs for temporary fix.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-11-17 14:03:36 -08:00
Daehyeok Mun
a9afebae62
Modified cpuset test for unicore test environment
...
Modified TestInspectApiCpusetInConfigPre120 and
TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu
environment.
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2015-11-17 13:28:09 -07:00
Jess Frazelle
aeccd45e5b
Merge pull request #17419 from nathwill/cent-install-docs
...
fix yum install docs
2015-11-17 20:57:15 +01:00
Alexander Morozov
70ce2d9b10
Skip apparmor tests on User Namespace
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-17 11:49:31 -08:00
Alexander Morozov
d3744fbeb1
Merge pull request #18002 from Microsoft/10662-registerlinks
...
Windows: Disable links
2015-11-17 11:48:53 -08:00
Eric Windisch
0df0b6b443
Revert "Skip TestAppArmorDeniesChmodProc"
...
This reverts commit 04e1015aa0
2015-11-17 11:46:42 -08:00
Eric Windisch
1bf5fcd911
Revert "Skip TestRunUnshareProc"
...
This reverts commit 03dce24137
2015-11-17 11:46:42 -08:00
Michael Crosby
e58b0bba7f
Merge pull request #18024 from LK4D4/simple_byparent
...
graph/graph.go: simplify appending to slice in map in byParent
2015-11-17 11:45:24 -08:00
Michael Crosby
1ecb9a40db
Merge pull request #17974 from anusha-ragunathan/fsMagic
...
Fix devmapper backend in docker info
2015-11-17 11:44:48 -08:00
Alexander Morozov
9187656305
Merge pull request #16639 from mrunalp/skip_dev_setup
...
Skip /dev setup in container when it is bind mounted in
2015-11-17 11:36:00 -08:00
Michael Crosby
19debeb255
Merge pull request #18027 from tpounds/fix-err-message-typo
...
Fix error typo when --expose and --net are specified
2015-11-17 11:34:40 -08:00
Michael Crosby
d0696ab7f6
Merge pull request #18028 from LK4D4/carry_17174
...
Use /usr/lib/os-release if /etc/os-release is missing.
2015-11-17 11:26:24 -08:00
Michael Crosby
68336bc832
Merge pull request #18043 from tianon/freebsd-package-name
...
Fix "./docker" package name on freebsd
2015-11-17 11:17:26 -08:00
