98eee11b79
Add Weave Network Plugin to docs/extend/plugins.md
...
Signed-off-by: pidster <pid@pidster.com >
Upstream-commit: f57073c72bfb30b083730be0623210ad5381ec58
Component: engine
2015-11-13 10:09:22 +00:00
23764c99f4
Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs
...
docs: update supported drivers for docker logs
Upstream-commit: 02bc514fb8f41c8e8815c835241d114a6d6fdbd2
Component: engine
2015-11-13 07:37:47 +01:00
17c34757b2
Merge pull request #17954 from LK4D4/move_utils_selinux
...
Rename daemon/utils_*.go to selinux
Upstream-commit: 6c27605df6af842da3308f2bf4f9d1a987ee6b2e
Component: engine
2015-11-12 20:06:21 -05:00
1ba9d92e95
Merge pull request #17941 from s093294/patch-1
...
updated instruction to correct file path
Upstream-commit: c5a10b1d2702937042e36e062016e1b5a868ad3c
Component: engine
2015-11-12 16:34:18 -08:00
1f5e02cdda
Merge pull request #17942 from thaJeztah/speedy-boarding
...
Docs: improve caching for make docs
Upstream-commit: c8399630ca5c85ab3020a3d621e11f536d9ac6ee
Component: engine
2015-11-12 16:33:41 -08:00
ec49c2f481
Rename daemon/utils_*.go to selinux
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f9daecc880f371cf652fd64095d65f0fe35fb2f7
Component: engine
2015-11-12 15:48:41 -08:00
32490eabee
Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
...
Windows: TP4 fix cpu weight
Upstream-commit: 588fedef4af1550f631a71ef1bd98998bc031613
Component: engine
2015-11-12 21:13:09 +01:00
442b6c9f86
Merge pull request #17948 from LK4D4/splunk_windows
...
Enable Splunk logdriver for windows
Upstream-commit: 318a13b0afbfe652c7b6de660caa6bbbf884e95d
Component: engine
2015-11-12 20:44:31 +01:00
c0d8796b26
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
95bf21f468
Windows: TP4 fix cpu weight
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 90eac6b48baac2b74b4721456fee4b3f2a0527b8
Component: engine
2015-11-12 11:08:24 -08:00
49104b66a5
Merge pull request #17947 from Blaisorblade/patch-1
...
Replace now broken link with a "permalink"
Upstream-commit: ef6cb749f0788813717c5f8522713dcdbeaa1915
Component: engine
2015-11-12 14:05:44 -05:00
95e4808678
Enable Splunk logdriver for windows
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 705b50850c47e44d82fb40b7f86ddb56a43c20f4
Component: engine
2015-11-12 10:57:21 -08:00
cbcccc4a34
Merge pull request #17929 from mqliang/hardCode
...
Removing TODO in pkg/term/windows
Upstream-commit: b99b23ba93d5f9f9eda97c020274994173419c88
Component: engine
2015-11-12 19:56:09 +01:00
06f47a5302
Replace now broken link with a "permalink"
...
Fix #17927 .
Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: 6b02876362680a1acd2c0fb1fdd85183cee03f20
Component: engine
2015-11-12 19:17:29 +01:00
d41faf6fe1
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
Upstream-commit: 8b9856dbd7a1981aaa76fcf0fc10b37d1141c9af
Component: engine
2015-11-12 09:51:36 -08:00
df454e9cb4
Merge pull request #17200 from maaquib/16756-integration-cli-events-test
...
Using checkers assert for integration-cli/docker_cli_events_test.go
Upstream-commit: ce29a8cc377f9918b71975ffaaa0c314d9977149
Component: engine
2015-11-12 16:43:12 +01:00
7ed1e0b2fb
Merge pull request #17898 from zelahi/16756-createtest-dockercli
...
changed if else statements to c.Asserts in docker_cli_create_test.go.
Upstream-commit: fc364751840e2e54e358d0b46efc9790c6fd9d19
Component: engine
2015-11-12 07:37:29 -08:00
d26ed08b21
Docs: improve caching for make docs
...
Use caching for all other repositories, instead
of doing a svn checkout each time.
This may result in showing outdated docs
for other repositories, but --no-cache can be
used if the latest docs are needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06a4e5f9815d55a91b17cc1eb6556bf029057ec6
Component: engine
2015-11-12 16:30:40 +01:00
c1e130b932
Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
...
Refactor ProcessConfig
Upstream-commit: 8cf38b6a8b031bd0d39d80d0a1d1b6e860a43acb
Component: engine
2015-11-12 07:28:32 -08:00
374d554d86
Merge pull request #17901 from runcom/remove-not-needed-func
...
hack: make.sh: remove not used function
Upstream-commit: eed704f7d933364e68cf29bcd4ed0e3591fd4b6b
Component: engine
2015-11-12 07:16:43 -08:00
f625d79ed0
updated instruction to correct file path
...
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz >
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net >
Upstream-commit: 593586721341c9e0acb00b55d1c3f283ac162697
Component: engine
2015-11-12 16:15:29 +01:00
46dd659ee1
Merge pull request #17631 from sallyom/docker-login-non-root
...
clarify docker login
Upstream-commit: 9c6e3396ef7ba44837ffaede0345ab3a105e8116
Component: engine
2015-11-12 22:39:35 +10:00
1449d82902
docker-login man/doc add security info
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: f9657819cdd9ea2a9327887db1c5a4aa405ffae9
Component: engine
2015-11-12 07:25:35 -05:00
a6fa6886f1
Merge pull request #17938 from thaJeztah/fix-docs-run-reference-link
...
docs: fix link to "run reference"
Upstream-commit: 715ddd6ee579378a50b8d646c5fbbf381db5b20f
Component: engine
2015-11-12 22:09:56 +10:00
66ebb69509
docs: fix link to "run reference"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f2705fa6ede76ad8b307ca184d3e146f5d69f7e6
Component: engine
2015-11-12 12:38:46 +01:00
6f7ab3ab7b
Merge pull request #17934 from sdurrheimer/zsh-completion-run-create-volume-driver
...
Add zsh completion for 'docker {run,create} --volume-driver'
Upstream-commit: 7d783ea5eb4c31be85a9b21bfac0c462d3d2d4f3
Component: engine
2015-11-12 05:41:41 -05:00
3be28d73f6
Merge pull request #17923 from LK4D4/simple_ckill
...
daemon/kill.go: simplify if statement
Upstream-commit: b6899ad56fd4cd1636642c58fb7f7bc161fddef6
Component: engine
2015-11-12 05:36:40 -05:00
c34deb74dc
kill TODO
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 644471bac85ca0d03645013767a5961504419d7c
Component: engine
2015-11-12 16:41:25 +08:00
860252559c
Add zsh completion for 'docker {run,create} --volume-driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9
Component: engine
2015-11-12 08:35:32 +01:00
5a4e81dc0c
Merge pull request #17388 from vikstrous/notary_docs
...
more notary documentation
Upstream-commit: 40ed821d2ebd9abb5cb9cf5c11c7b67c905ee3be
Component: engine
2015-11-11 20:07:55 -08:00
d9d92c1e64
more notary documentation
...
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com >
Upstream-commit: e869e8aa3d0671394f83d0b6ea7d90cb310e5b61
Component: engine
2015-11-11 19:56:10 -08:00
14b70450aa
Merge pull request #17925 from cpuguy83/fix_locker_unit_tests
...
Use timeouts instead of relying on runtime.GoSched
Upstream-commit: 2337db8205f72b190f46a73dd28a25cee0f968f9
Component: engine
2015-11-11 18:46:52 -08:00
c0a993088d
Use timeouts instead of relying on runtime.GoSched
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: fd672d59269d100acbb36abef4e4eddc1d30bdc7
Component: engine
2015-11-11 20:59:07 -05:00
2552a392d2
daemon/kill.go: simplify if statement
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: fa7ec908c493161892ebdd7c51b440367f527805
Component: engine
2015-11-11 17:19:39 -08:00
bc3ac4cb1c
Merge pull request #17919 from Microsoft/jjh/tp4
...
Windows [TP4] Require build 10586+
Upstream-commit: 87de5fdd5972343a11847922e0f41d9898b5cff7
Component: engine
2015-11-11 19:36:13 -05:00
53e497ffae
Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
...
Windows [TP4] Fix docker cp when volumes
Upstream-commit: 5b046c71d8ab944ad88baf9f92ae6b3b78a28cdd
Component: engine
2015-11-11 19:35:05 -05:00
b05ed8c964
Merge pull request #17921 from thaJeztah/thou-shalt-not-use-we
...
Fix find and replace typo in dockerimages
Upstream-commit: 6c31b17dfdd08b437ebff0deb696f50c90dc4416
Component: engine
2015-11-12 00:09:46 +00:00
6b208d3136
Fix find and replace typo in dockerimages
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a4b2de674c7030e70f671d5d6dcedb0c7ca5b0cd
Component: engine
2015-11-12 00:52:31 +01:00
c7dd3d34fc
Merge pull request #17918 from anusha-ragunathan/fsMagic
...
Include xfsprogs in build environment.
Upstream-commit: b664a8825ea20a729f14a49dcc0fc51ca4e01d8b
Component: engine
2015-11-11 15:43:52 -08:00
7a3117ab3d
Using checkers assert for integration-cli/docker_cli_events_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: 2910f1101df088c20d22c1adf00c1c3ceb382ddf
Component: engine
2015-11-11 18:12:30 -05:00
a3794d804f
Windows [TP4] Require build 10586+
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 122568b31465127537197cf6d9575b00bdd02045
Component: engine
2015-11-11 14:49:14 -08:00
83fc2cf8e7
Include xfsprogs in build environment.
...
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1
Component: engine
2015-11-11 14:42:08 -08:00
049a764149
Merge pull request #17913 from clnperez/oom-test-requires
...
Add the memoryLimitSupport requirement to Events OOM tests
Upstream-commit: 9d4e2f3992553b660d690093a0a294d1633b7dc6
Component: engine
2015-11-11 23:24:10 +01:00
470099dd9c
Merge pull request #17894 from mqliang/deferMove
...
move defer statement for readability
Upstream-commit: 6c82fba2b32781e6cef4fda71e7b35c3dcdcb9da
Component: engine
2015-11-11 14:03:48 -08:00
d8d32d2bbf
Windows [TP4] Fix docker cp when volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3a852d8442f31651f0e776430432e5dda44455e0
Component: engine
2015-11-11 14:02:07 -08:00
7a892cd97a
Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
...
Devicemapper: Default to xfs instead of ext4
Upstream-commit: adb14543fd2a550a3b9a8cb12637e376cd398be4
Component: engine
2015-11-11 16:42:58 -05:00
60cb2034d2
Merge pull request #17883 from dave-tucker/bug/17709
...
Add required ports for Overlay to docs
Upstream-commit: 6c5395360fd9687fcd5962eb2b1c4fe0a7a2cabe
Component: engine
2015-11-11 13:10:22 -08:00
06bdd98fbf
Merge pull request #17915 from moxiegirl/17764-fix
...
Adding in Contiv plugins
Upstream-commit: e49e6b7bfdf0e731aa0e846d1c29ab9d96a2a1d9
Component: engine
2015-11-11 20:56:57 +00:00
89f92046ef
Adding in Contiv plugins
...
Fixes #17764
Also fixed problem where the menu ordering was off
Fix the wrap
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 40fc3a8bcf39e52e45c2aac3808987a5499094d8
Component: engine
2015-11-11 12:56:07 -08:00
7803fdccdd
Merge pull request #17813 from davidcurrie/mhn-updates
...
Updates to Get started with multi-host networking
Upstream-commit: f74c423255d8b61b4a9a609449bc389f616eb637
Component: engine
2015-11-11 12:43:45 -08:00
pidster
Sebastiaan van Stijn
Brian Goff
moxiegirl
Alexander Morozov
Vincent Demeester
John Howard
James Turnbull
Paolo G. Giarrusso
Tianon Gravi
David Calavera
Sebastiaan van Stijn
Poul Kjeldager Sørensen
Sven Dowideit
Sally O'Malley
mqliang
Steve Durrheimer
Viktor Stanchev
Alexander Morozov
Michael Crosby
Mohammed Aaqib Ansari
Anusha Ragunathan
Antonio Murdaca
Tibor Vass