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
c83373112c
Merge pull request #17986 from bogdangrigg/master
...
Fix small typos in documentation files
2015-11-17 16:45:38 -08:00
2ee56ce1e1
Merge pull request #18011 from lrkwz/patch-1
...
Update ubuntulinux.md
2015-11-17 16:44:33 -08:00
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
662b9623c1
Merge pull request #17866 from shekhargulati/patch-1
...
added rx-docker-client library
2015-11-17 16:15:15 -08:00
e2417e3e92
Merge pull request #17617 from askb/17168_pull_error_fix
...
Fix for #17168 issue
2015-11-17 16:10:44 -08:00
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
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
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
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
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
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
adce1981f4
Merge pull request #17593 from daehyeok/refactoring_json_log
...
Refactoring json log driver
2015-11-17 15:38:52 -08:00
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
7147ac6ce7
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
2015-11-17 15:12:08 -08:00
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
aeccd45e5b
Merge pull request #17419 from nathwill/cent-install-docs
...
fix yum install docs
2015-11-17 20:57:15 +01:00
d3744fbeb1
Merge pull request #18002 from Microsoft/10662-registerlinks
...
Windows: Disable links
2015-11-17 11:48:53 -08:00
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
1ecb9a40db
Merge pull request #17974 from anusha-ragunathan/fsMagic
...
Fix devmapper backend in docker info
2015-11-17 11:44:48 -08:00
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
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
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
68336bc832
Merge pull request #18043 from tianon/freebsd-package-name
...
Fix "./docker" package name on freebsd
2015-11-17 11:17:26 -08:00
4dda67b801
Merge pull request #16452 from rhatdan/btrfs-selinux
...
Relabel BTRFS Content on container Creation
2015-11-17 11:03:40 -08:00
8fff64fe4f
Merge pull request #18044 from tianon/a.out
...
Prevent the creation of "a.out" at the repo root
2015-11-17 20:00:07 +01:00
f18d5da6a7
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
e55274e3fe
Merge pull request #18014 from calavera/make_normalize_local_name_local
...
Make NormalizeLocalName to not reach the network to normalize names.
2015-11-17 10:23:41 -08:00
7f608c391d
Prevent the creation of "a.out" at the repo root
...
Our clever "gcc" invocations were creating a spurious "a.out" file at the root of the repo (which just happened to be in ".gitignore" so we didn't notice it sooner).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-17 09:44:36 -08:00
e54c4517a7
Fix "./docker" package name on freebsd
...
This fixes "can't load package: package ./docker: found packages client.go (main) and daemon_freebsd.go (docker)"
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-17 09:38:19 -08:00
71f422435e
Merge pull request #17999 from tianon/linkmode-external
...
Remove "-linkmode external"
2015-11-17 08:33:32 -08:00
1c8d8b3012
Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
...
Add initial support for Docker on ARM
2015-11-17 16:52:54 +01:00
d507acb175
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
2015-11-17 16:40:06 +01:00
af9757576c
Merge pull request #17556 from donhcd/testForStatsVersioning
...
Test for stats versioning
2015-11-17 11:19:34 +01:00
6f1bc096a6
Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
...
Windows: Fix docker exec
2015-11-17 11:14:54 +01:00
a2d87d14ac
Merge pull request #18037 from dm4/fix-aufs-markdown-syntax
...
Fix Markdown syntax error in aufs-driver.md
2015-11-17 11:13:01 +01:00
ea04764059
Fix Markdown syntax error in aufs-driver
...
Signed-off-by: dm4 <dm4@skymizer.com>
2015-11-17 17:38:36 +08:00
b665730d2c
Make NormalizeLocalName to not reach the network to normalize names.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-17 03:31:32 -05:00
a25988cf76
Fix typo when --expose and --net are specified.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
2015-11-16 22:01:20 -08:00
81aa1b507f
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-16 17:10:53 -08:00
ef424c108a
Merge pull request #17988 from Microsoft/jjh/pushv2
...
Windows [TP4] Fix push to not kill daemon
2015-11-17 01:28:34 +01:00
292a15e40a
Use /usr/lib/os-release if /etc/os-release is missing.
...
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.
http://www.freedesktop.org/software/systemd/man/os-release.html
Thanks James Hunt <james.o.hunt@intel.com> and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com> for contribution.
Close #17174
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-16 16:21:31 -08:00
25b37e2f04
graph/graph.go: simplify appending to slice in map in byParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-16 12:02:35 -08:00
d7692b02bd
Typo in previous PR processConfig, not c.ProcessConfig
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-16 11:56:01 -08:00
a3065fa48f
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
4b706195d2
Merge pull request #17515 from azurezk/fixdoc
...
fix doc of volume name conflict
2015-11-16 09:15:50 -08:00
e88ffba2ec
Merge pull request #18016 from moxiegirl/carry-17453
...
docs: modifying volumes guide to remove ambiguity. Signed-off-by: And…
2015-11-16 17:35:04 +01:00
7c5cdda74e
Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
...
fix the bug: cpu percent will extremely high
2015-11-16 17:26:29 +01:00
be2152116c
docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com>
...
Adjusted as per comment.
Rebase and squash by moxigirl
Signed-off-by: Andre Granovsky <robotciti@live.com>
2015-11-16 08:24:26 -08:00
fe123edb08
Update ubuntulinux.md
...
Remove '*' for purge
Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com>
2015-11-16 13:29:36 +01:00
Alexander Morozov
moxiegirl
Michael Crosby
Aaron Lehmann
Daehyeok Mun
Jess Frazelle
Antonio Murdaca
Tianon Gravi
David Calavera
Lee, Meng-Han
Trevor Pounds
Alexander Morozov
Tibor Vass
Darren Stahl
Sebastiaan van Stijn
Andre Granovsky
Luca Orlandi