76ff8db2cc
Merge pull request #14205 from YanFeng-Adam/patch
...
update testcase mount/sharedsubtree_linux_test.go
Upstream-commit: 363cc51e82cd69e91f81086f50a31c0ecc61f4b1
Component: engine
2015-07-13 14:28:30 -07:00
ebb3aa0ddb
Merge pull request #14567 from Microsoft/10662-fixbuilder
...
Windows: Fix builder
Upstream-commit: 15f9766691b7af54a0b5aca94f0777c50d2fd8c5
Component: engine
2015-07-13 13:50:52 -07:00
b0b206a336
Merge pull request #14516 from Microsoft/10662-mergeLXCconf
...
Windows: Tidy up daemon\utils*.go
Upstream-commit: c2b9fa8c9a70be7f4305cf30636d276499980bac
Component: engine
2015-07-13 14:47:25 -06:00
d231ef5cce
Merge pull request #14556 from Evalle/14497-fix-install-script
...
Fix issue with detection logic of Centos in install.sh
Upstream-commit: 655b1d23678f67857a1d39606eebb86799f65f06
Component: engine
2015-07-13 13:47:08 -07:00
6e9e97f954
Merge pull request #14601 from runcom/cleanup-deleteImages
...
Cleanup not needed calls to deleteImages
Upstream-commit: 1da384314978a9921bc65d2182ea5572e429eb34
Component: engine
2015-07-13 14:04:20 -06:00
8a6a98a270
Merge pull request #14596 from Microsoft/quieter-clean-exec-commands
...
Quieter debug logging for clean exec commands
Upstream-commit: 9158ddef890deb624e2c8924a3c14132d55f18ad
Component: engine
2015-07-13 15:43:27 -04:00
7af622bdcb
Fix issue with detection logic of Centos in install.sh
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 33039aa12939f6be6d8775ca5d9bee7541641053
Component: engine
2015-07-13 20:50:31 +02:00
f4541a8bb5
Cleanup not needed calls to deleteImages
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d3566fa0b1130fb938ad55da69fee2b7790dc3cf
Component: engine
2015-07-13 20:30:53 +02:00
548aa9241e
Merge pull request #14597 from albers/docs-typo-1
...
Fix typo in documentation
Upstream-commit: 4ef67b79bc8d831f726268bbb1edca7e032a8018
Component: engine
2015-07-13 19:56:54 +02:00
0a8f0f82e0
Quieter debug logging for clean exec commands
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b271593c34a67f4040405c952fdb402bf5dcd151
Component: engine
2015-07-13 10:36:36 -07:00
4d4c7231d9
Merge pull request #14500 from runcom/add-diff-emtpy-arg-test
...
Add diff command with emtpy string testcase
Upstream-commit: 0f466c36b9dcf12eafb7968b896b6f5027df3231
Component: engine
2015-07-13 11:30:31 -06:00
492b0deece
Fix typo in documentation
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 41def26c1b762b89d3dd0cb3339435f1144320ce
Component: engine
2015-07-13 19:17:33 +02:00
8014aa30a4
Merge pull request #14426 from albers/completion-events
...
Add some missing events to bash completion
Upstream-commit: 0badebe7348af1b56bce002bb8d1fca03dbdb872
Component: engine
2015-07-13 10:05:36 -07:00
65d79024c0
Merge pull request #14587 from rhatdan/man
...
Man page fixes
Upstream-commit: b39c330a185265163eedcc61b8bc917963034840
Component: engine
2015-07-13 10:59:55 -06:00
4ffa6dd1f2
Merge pull request #14508 from jfrazelle/deb-rpm-make
...
add deb and rpm targets to makefile
Upstream-commit: a20994fd54dabb7b072daed7623de379807fb6d6
Component: engine
2015-07-13 09:48:43 -07:00
13164e4231
Merge pull request #14583 from sagarhani/patch-1
...
Added entry for Sir M.Visvesvaraya
Upstream-commit: e13f9edfed5d431edddec0662ede132b797d94e4
Component: engine
2015-07-13 10:47:08 -06:00
6e65c312b4
Merge pull request #14569 from vdemeester/pkg-fileutils-tests
...
Add missing tests and docs for pkg/fileutils
Upstream-commit: 7ba54a46284d6658d0686ad0040c0ad99cb2c66f
Component: engine
2015-07-13 09:29:30 -07:00
4765b9898c
Merge pull request #14554 from Ajeey/added-notable-indian-scientists
...
Added notable indian scientists to names-generator.go
Upstream-commit: 161f5b27906af792a241bffb8537af66b268d715
Component: engine
2015-07-13 09:05:47 -07:00
aa03f09fc5
Merge pull request #14553 from WPH95/fix-install
...
Fix failure on adding source list for ubuntu
Upstream-commit: eb174dbb1e9fda58c112455bbfa08b583997077b
Component: engine
2015-07-13 09:00:26 -07:00
838d3d706b
Merge pull request #14586 from Tenk42/14362-Improve-sockRequestRaw-check
...
Improve sockRequest and sockRequestRaw check
Upstream-commit: 1f963af697e8df3a78217f6fdbf67b8123a7db94
Component: engine
2015-07-13 15:59:39 +02:00
239d35a2bc
Merge pull request #14588 from rhatdan/ro
...
We now support multiple roModes
Upstream-commit: 24c09006c9beedee9c9a54719b6b34d584b3555b
Component: engine
2015-07-13 09:53:55 -04:00
eaf197ed98
Merge pull request #14004 from ktraghavendra/13938_container_swappiness
...
Add the memory swappiness tuning option to docker.
Upstream-commit: 441ae6c94398dc52a8e6918296b15e6d5b3b4b8e
Component: engine
2015-07-13 09:22:08 -04:00
2f5df0962e
We now support multiple roModes
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: b28d6eaa94e994e7102df94ceb13a3fb6c53ab59
Component: engine
2015-07-13 09:19:15 -04:00
b583293ba4
Robert P.J. Day found this problems in man pages
...
Example in docker search has an extranious -t
docker rmi has a typo
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 3eea6f753a434418a38f0681bc198a7c91bc1c50
Component: engine
2015-07-13 08:59:03 -04:00
cc86945735
Improve sockRequest and sockRequestRaw check
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
Upstream-commit: fa6925aa9b3aad37e93bc38602bb665b4a2badf9
Component: engine
2015-07-13 21:49:08 +09:00
383889c82f
Added entry for Sir M.Visvesvaraya
...
Signed-off-by: Sagar Hani <sagarhani33@gmail.com >
Upstream-commit: 45dbdabdc737ca85926a03ea33df673979d2f18f
Component: engine
2015-07-13 17:20:45 +05:30
64b3ddbb50
Merge pull request #14559 from Microsoft/10662-todo1
...
Windows: Move daemon check back centrally
Upstream-commit: b0da494aa30df76533fdb0f66efbf5b17b3ed214
Component: engine
2015-07-12 21:22:43 -07:00
90e3aa44eb
Add missing tests and docs for pkg/fileutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 09adf87f23b3de97f90612c9bc08413053b81a14
Component: engine
2015-07-12 22:43:42 +02:00
b57d4c713b
Add minor vet fixes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 26ce3f4c90058a2b2f23a2cb36492cfa7963494c
Component: engine
2015-07-12 19:16:38 +02:00
737b8d4b0e
Windows: Fix builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2ceb1146078f900a686019398a94d113943beeb9
Component: engine
2015-07-12 09:06:18 -07:00
11e2c4a554
Add the memory swappiness tuning option to docker.
...
Memory swappiness option takes 0-100, and helps to tune swappiness
behavior per container.
For example, When a lower value of swappiness is chosen
the container will see minimum major faults. When no value is
specified for memory-swappiness in docker UI, it is inherited from
parent cgroup. (generally 60 unless it is changed).
Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com >
Upstream-commit: 921da495d24695dda66d3f58e78887dd0bc2402e
Component: engine
2015-07-12 13:16:33 +05:30
975b53b7ee
Windows: Move daemon check back centrally
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 62a75fca689d235276a6aeaa91a5230de522a3f1
Component: engine
2015-07-11 12:42:46 -07:00
400b116f99
Added notable indian scientists to names-generator.go
...
Signed-off-by: Ajey Charantimath <ajey.charantimath@gmail.com >
Upstream-commit: c27b93ea26f3a168971360c4f54286ea8653528b
Component: engine
2015-07-11 20:11:22 +05:30
6ee85e4248
Fix failure on adding source list for ubuntu
...
For hybrid cloud, some ubuntu vm images doesn't have the directory
`/etc/apt/sources.list.d` which cause failure on creating
`/etc/apt/sources.list.d/docker.list`.
To fix this issue, create this directory first (if it doesn't exist).
Signed-off-by: Penghan Wang <ph.wang@daocloud.io >
Upstream-commit: 80e90499aafabb27c68a2ddca31339aa125c40ae
Component: engine
2015-07-11 22:37:02 +08:00
8e13e89b0b
Merge pull request #14537 from stevvooe/allow-one-character-repository-names
...
Allow one character repository names
Upstream-commit: 9264d384244d7334a45c4e3d46c639683993a077
Component: engine
2015-07-10 15:41:53 -07:00
e92413dd0d
Merge pull request #14371 from Microsoft/10662-graphdriver
...
Windows: Graph driver implementation
Upstream-commit: 4aeb84612f530d01e0b4f5b3fff40d2a6978f6f4
Component: engine
2015-07-10 15:35:00 -07:00
6b5ea18f12
Merge pull request #13986 from tg123/master
...
prompt a cli login if receive 401 from registry v2 auth server
Upstream-commit: ff8cef332663584504c24a1e4968069b1fcdc29c
Component: engine
2015-07-10 15:33:42 -07:00
9f9bda0c57
Merge pull request #13669 from ewindisch/readonly-proc
...
Make /proc, /sys, & /dev readonly for readonly containers
Upstream-commit: 703248da20566f707b8290662805a9264629e2e0
Component: engine
2015-07-10 15:32:13 -07:00
914754c805
Merge pull request #14501 from duglin/FixCommitDocs
...
Align 'docker commit' docs with the code
Upstream-commit: 892ac93ec9fce417dfca9ce397c8e1d771b604e8
Component: engine
2015-07-10 15:21:29 -07:00
f177b87b50
Merge pull request #14533 from natebrennand/update-docker-config-docs
...
update reference to config file
Upstream-commit: a828415286202343e680aa8372c01d062056dc4b
Component: engine
2015-07-10 15:20:52 -07:00
1296feade8
Windows: Graph driver implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 52f4d09ffb376ffaa6677cb1e0413c6a97f53f24
Component: engine
2015-07-10 14:33:11 -07:00
576b45a55d
Merge pull request #13554 from Microsoft/10662-winexec
...
Windows: The real Windows exec driver is here.
Upstream-commit: b7e8169274ba4b897601e1025b91ebd361902213
Component: engine
2015-07-10 17:13:10 -04:00
5b7992c914
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
Upstream-commit: 5bf98dd997bbc4db2a70594669457417498212bd
Component: engine
2015-07-10 23:05:49 +02:00
c3450bd95b
Windows: Exec driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9ae9d4c87af8b04eb80006aca9f760ffdb1052bb
Component: engine
2015-07-10 13:36:56 -07:00
c4e83663e0
Allow one character repository name components
...
The docker/distribution dependency was updated in the previous commit to allow
repository name components to only consist of a single letter. The unit tests
have been updated to cement this change.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 451789cf88d678ed887a29b0aeeeccab5d6c735a
Component: engine
2015-07-10 14:06:15 -06:00
6198a7df78
Update docker/distribution dependency
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: bfd5202c17969d728e69972ad6adaf2aa7c79a91
Component: engine
2015-07-10 14:05:38 -06:00
3e1377983b
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: daced1d30345aca06857f874dfb48b7e90cb409b
Component: engine
2015-07-10 12:51:34 -07:00
3a1c206f9b
Merge pull request #14306 from Microsoft/validatepsfilter
...
Validate status= filter to docker ps
Upstream-commit: 20ac0e61643ec185052b8f29272aba1e95be76ec
Component: engine
2015-07-10 15:43:01 -04:00
44b29b0ccc
update reference to config file
...
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.
Signed-off-by: Nate Brennand <nate.brennand@clever.com >
Upstream-commit: 6827782bef07afe440acc46676e4850734fcc991
Component: engine
2015-07-10 18:55:47 +00:00
d67b6b5d43
Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc
...
Fix docs for oom-kill-disable
Upstream-commit: 5bf335d0a22542a3b70ba879bc69333385efd749
Component: engine
2015-07-10 11:15:02 -07:00
