42a56c8bb4
Merge pull request #17986 from bogdangrigg/master
...
Fix small typos in documentation files
Upstream-commit: c83373112c908f7c5afc85fc6b08640817920a6d
Component: engine
2015-11-17 16:45:38 -08:00
4457dd940b
Merge pull request #18011 from lrkwz/patch-1
...
Update ubuntulinux.md
Upstream-commit: 2ee56ce1e1b3f8f6ab72b4235ad28387fe81b675
Component: engine
2015-11-17 16:44:33 -08:00
1944ac916a
Merge pull request #17261 from mountkin/remove-unused-daemon-config
...
remove the unused DefaultNetwork member from daemon.Config
Upstream-commit: 3f508f08deca82536b4e1ef6d591335e98e3f5d1
Component: engine
2015-11-17 16:33:11 -08:00
6064eebd4e
Merge pull request #17866 from shekhargulati/patch-1
...
added rx-docker-client library
Upstream-commit: 662b9623c1e47676f40b5dccd150475d54cd88a0
Component: engine
2015-11-17 16:15:15 -08:00
ebcb6dad25
Merge pull request #17617 from askb/17168_pull_error_fix
...
Fix for #17168 issue
Upstream-commit: e2417e3e926d2b45049a663bc62828a70fbfab2a
Component: engine
2015-11-17 16:10:44 -08:00
4d1e8a4a9f
Merge pull request #17294 from zhangjianfnst/16756-integration-cli-checkers-cp
...
Use checker assert for integration-cli/docker_cli_cp_* four files.
Upstream-commit: a935359ec7c2c7f0ae4c1c389c959387c01e725e
Component: engine
2015-11-17 16:00:00 -08:00
76f661e7cd
Merge pull request #17452 from aditirajagopal/16756-docker_cli_by_digest_test
...
Checkers on docker_cli_by_digest_test
Upstream-commit: 92ea146790accdf4a07cc311a69a74f840d053ce
Component: engine
2015-11-17 15:58:05 -08:00
fe4028f4f6
Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
...
Add zsh completion for log options
Upstream-commit: 346d195f6a8ed5217cb859ed1a6673eeb840e21d
Component: engine
2015-11-17 15:53:31 -08:00
7f6a96fa5d
Merge pull request #17434 from little-arhat/fix/newlines-in-json-status
...
Add newlines to FormatProgress for JSON as well
Upstream-commit: 53556183c7649480852d13d168a28dcfe92ac7f1
Component: engine
2015-11-17 15:52:31 -08:00
c4d89a3f60
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
2015-11-17 15:44:57 -08:00
804455e1fb
Merge pull request #17593 from daehyeok/refactoring_json_log
...
Refactoring json log driver
Upstream-commit: adce1981f4c7fe653ae76cdd1f84d75f88b273cd
Component: engine
2015-11-17 15:38:52 -08:00
7810e6e5eb
Merge pull request #18000 from daehyeok/fix_dry_run_test
...
Modified cpuset test for unicore test environment
Upstream-commit: ca0b41e3373013c06fb7c23428d7cf0616a57824
Component: engine
2015-11-17 15:15:09 -08:00
64fc0f7510
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
Upstream-commit: 7147ac6ce730fee150caeb627b426fb9f45daf80
Component: engine
2015-11-17 15:12:08 -08:00
9c5f927ad3
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 >
Upstream-commit: a9afebae6240cfd48a93c182cbbdff4f09d6a6a0
Component: engine
2015-11-17 13:28:09 -07:00
0fb0e27d0c
Merge pull request #17419 from nathwill/cent-install-docs
...
fix yum install docs
Upstream-commit: aeccd45e5b4074cebb1cbe3bb51b6bde4111048a
Component: engine
2015-11-17 20:57:15 +01:00
ab3af36722
Merge pull request #18002 from Microsoft/10662-registerlinks
...
Windows: Disable links
Upstream-commit: d3744fbeb109bffbaeba35c94858afe3bf50376c
Component: engine
2015-11-17 11:48:53 -08:00
b087b271a9
Merge pull request #18024 from LK4D4/simple_byparent
...
graph/graph.go: simplify appending to slice in map in byParent
Upstream-commit: e58b0bba7fac16e2bab57ad66caeed1663e2c27c
Component: engine
2015-11-17 11:45:24 -08:00
f3cdb6f05f
Merge pull request #17974 from anusha-ragunathan/fsMagic
...
Fix devmapper backend in docker info
Upstream-commit: 1ecb9a40db176489ac8760251abe56e560bc848d
Component: engine
2015-11-17 11:44:48 -08:00
1d5287a6dd
Merge pull request #16639 from mrunalp/skip_dev_setup
...
Skip /dev setup in container when it is bind mounted in
Upstream-commit: 91876563052a1d84902e365cbe8b9eaf96846e91
Component: engine
2015-11-17 11:36:00 -08:00
c9e22f7865
Merge pull request #18027 from tpounds/fix-err-message-typo
...
Fix error typo when --expose and --net are specified
Upstream-commit: 19debeb255c0676148a0efeb2cd7f0f3f38e9edd
Component: engine
2015-11-17 11:34:40 -08:00
7023420733
Merge pull request #18028 from LK4D4/carry_17174
...
Use /usr/lib/os-release if /etc/os-release is missing.
Upstream-commit: d0696ab7f6ff33f072e5b77ef54a6c64a3227741
Component: engine
2015-11-17 11:26:24 -08:00
38c311e5a8
Merge pull request #18043 from tianon/freebsd-package-name
...
Fix "./docker" package name on freebsd
Upstream-commit: 68336bc8327232e6a165ab33e6dc9fc25a7872e7
Component: engine
2015-11-17 11:17:26 -08:00
07479c944e
Merge pull request #16452 from rhatdan/btrfs-selinux
...
Relabel BTRFS Content on container Creation
Upstream-commit: 4dda67b8014e71508e992c736febc5c45c53c095
Component: engine
2015-11-17 11:03:40 -08:00
50c6398318
Merge pull request #18044 from tianon/a.out
...
Prevent the creation of "a.out" at the repo root
Upstream-commit: 8fff64fe4fd0fd06fec2334e131d1260462f4ef6
Component: engine
2015-11-17 20:00:07 +01:00
22f6a379ae
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
Upstream-commit: f18d5da6a7d148581f8de041ada62b1724839957
Component: engine
2015-11-17 10:46:29 -08:00
18b7d28382
Merge pull request #18014 from calavera/make_normalize_local_name_local
...
Make NormalizeLocalName to not reach the network to normalize names.
Upstream-commit: e55274e3fe44f8f793443c9c689c1be77fe94f7f
Component: engine
2015-11-17 10:23:41 -08:00
acf57d6a06
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 >
Upstream-commit: 7f608c391dc62a712cf0d641698ed1cdc38a4e6c
Component: engine
2015-11-17 09:44:36 -08:00
d1d856514e
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 >
Upstream-commit: e54c4517a78ea87e6611784f9900e82f60a23303
Component: engine
2015-11-17 09:38:19 -08:00
820dd65e7d
Merge pull request #17999 from tianon/linkmode-external
...
Remove "-linkmode external"
Upstream-commit: 71f422435ed0ea645355f1375e2a778822416302
Component: engine
2015-11-17 08:33:32 -08:00
2ed2d47ded
Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
...
Add initial support for Docker on ARM
Upstream-commit: 1c8d8b301259ae18cfdb56043c000e8353987a3a
Component: engine
2015-11-17 16:52:54 +01:00
98dbfb535e
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
Upstream-commit: d507acb17564986af17f653d8fa1b774993451b4
Component: engine
2015-11-17 16:40:06 +01:00
e6a1f28a7f
Merge pull request #17556 from donhcd/testForStatsVersioning
...
Test for stats versioning
Upstream-commit: af9757576c69159078a1ed8e1d61049a173eafa1
Component: engine
2015-11-17 11:19:34 +01:00
567557144f
Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
...
Windows: Fix docker exec
Upstream-commit: 6f1bc096a64efb592b56dbdefc5bfce1fa7935d3
Component: engine
2015-11-17 11:14:54 +01:00
844d964e9e
Fix Markdown syntax error in aufs-driver
...
Signed-off-by: dm4 <dm4@skymizer.com >
Upstream-commit: ea047640597929436f13099fb3dc1e52f98f685b
Component: engine
2015-11-17 17:38:36 +08:00
f8169b65c3
Make NormalizeLocalName to not reach the network to normalize names.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b665730d2c76cf991c123ad3387d6ba736a7515a
Component: engine
2015-11-17 03:31:32 -05:00
b68e94a11d
Fix typo when --expose and --net are specified.
...
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com >
Upstream-commit: a25988cf760b96c855b3e1442547ea9d763c7cd1
Component: engine
2015-11-16 22:01:20 -08:00
a7857ff3b0
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 81aa1b507f51901eafcfaad70a656da376cf937d
Component: engine
2015-11-16 17:10:53 -08:00
d87c897f93
Merge pull request #17988 from Microsoft/jjh/pushv2
...
Windows [TP4] Fix push to not kill daemon
Upstream-commit: ef424c108a90a04e9c5b0bd48b9047054a6a798b
Component: engine
2015-11-17 01:28:34 +01:00
eb219a3ce5
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 >
Upstream-commit: 292a15e40a7201801fb9b0abd81175fd0a09a814
Component: engine
2015-11-16 16:21:31 -08:00
c14625645c
graph/graph.go: simplify appending to slice in map in byParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 25b37e2f0481e5e71e0c9c89827823affd50dd77
Component: engine
2015-11-16 12:02:35 -08:00
05e1d2c256
Typo in previous PR processConfig, not c.ProcessConfig
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d7692b02bdeafc2837bf4269527c2eaa8be254b1
Component: engine
2015-11-16 11:56:01 -08:00
cbf9321ca8
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
a86a41003e
Merge pull request #17515 from azurezk/fixdoc
...
fix doc of volume name conflict
Upstream-commit: 4b706195d2e5b551ce08620862fdc4a8f8c8489f
Component: engine
2015-11-16 09:15:50 -08:00
48f3b95e87
Merge pull request #18016 from moxiegirl/carry-17453
...
docs: modifying volumes guide to remove ambiguity. Signed-off-by: And…
Upstream-commit: e88ffba2ecc01f1185523013b54479dfc58f971a
Component: engine
2015-11-16 17:35:04 +01:00
7c619e8f4a
Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
...
fix the bug: cpu percent will extremely high
Upstream-commit: 7c5cdda74eaf27a31ec1a7b6e4d79ff0f0bbae4d
Component: engine
2015-11-16 17:26:29 +01:00
e0d2996208
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 >
Upstream-commit: be2152116cd719b65d4b58c3b8fb7f63d7655f4b
Component: engine
2015-11-16 08:24:26 -08:00
a3d77b0213
Update ubuntulinux.md
...
Remove '*' for purge
Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com >
Upstream-commit: fe123edb080a2e60ce4d34fb0cf72d06c80cba79
Component: engine
2015-11-16 13:29:36 +01:00
8bae47da35
Merge pull request #17985 from Microsoft/jjh/firstboot
...
Windows: [TP4] Fix regression on second or later container starts
Upstream-commit: 92487d7fb4963c0333c409d053ff694e619c538d
Component: engine
2015-11-16 10:03:46 +01:00
3e26fccb77
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
Upstream-commit: aa7fd884e609d3d13df628600a1799e0e76444e9
Component: engine
2015-11-16 15:28:09 +09:00
5b2890f6ff
Windows: Disable links
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b2771b4456f12c0f55ee0f1e70d620fe1a77ca4f
Component: engine
2015-11-15 21:32:31 -08:00
