Sebastiaan van Stijn
48ea08613f
Merge pull request #30387 from coolljt0725/fix_typo
...
typo: fix typo in api documents
(cherry picked from commit de1a403810
2017-02-22 00:47:21 +01:00
Vincent Demeester
8b34bd1980
Merge pull request #30130 from ijc25/clarify-cp-docs
...
Clarify `cp` documentation behaviour with trailing "/."
(cherry picked from commit 8b7ba17d33
2017-02-22 00:47:16 +01:00
Sebastiaan van Stijn
6e9f3fda73
Merge pull request #30094 from miaoyq/complete-opt-for-plugin-install
...
Complete the options for 'docker plugin install'
(cherry picked from commit 8c7651998f
2017-02-22 00:47:10 +01:00
Sebastiaan van Stijn
e688aacaa5
Merge pull request #30011 from davidwilliamson/patch-1
...
Provide password to volume create command
(cherry picked from commit 36db5f6f68
2017-02-22 00:47:04 +01:00
Vincent Demeester
03ed0afa29
Merge pull request #30000 from ralphtheninja/master
...
Attempts -> MaxAttempts in /services/create
(cherry picked from commit 4166801f60
2017-02-22 00:46:58 +01:00
Sebastiaan van Stijn
27fb9af0e6
Merge pull request #29989 from yuexiao-wang/fix-url-alias
...
Fix incorrect alias and URL
(cherry picked from commit 03d28f75b8
2017-02-22 00:46:53 +01:00
Alexander Morozov
d9e0ef7cc8
Merge pull request #29830 from timthelion/issue29821
...
Docs: Be more clear when specifying valid formats for strings
(cherry picked from commit effc91e7a5
2017-02-22 00:46:48 +01:00
Vincent Demeester
ff8f643ce1
Merge pull request #29774 from miaoyq/complete-plugin-create-docs-content
...
Complete the document content
(cherry picked from commit 5374d53322
2017-02-22 00:46:42 +01:00
Sebastiaan van Stijn
d38979b8bb
Merge pull request #29763 from omallo/29729-dostorage-plugin-docs
...
Reference new DigitalOcean plugin (Closes #29729 )
(cherry picked from commit 841968d55c
2017-02-22 00:46:36 +01:00
Sebastiaan van Stijn
6458b4e951
Merge pull request #29744 from yuexiao-wang/update-docker-ps
...
Update the field 'CONTAINER ID' for docker ps
(cherry picked from commit 01c62d6e54
2017-02-22 00:46:31 +01:00
Vincent Demeester
a405b95bcf
Merge pull request #29699 from yuexiao-wang/update-index
...
Update the index of docker command line
(cherry picked from commit af843c53f8
2017-02-22 00:46:24 +01:00
Sebastiaan van Stijn
676b256bf2
Merge pull request #29696 from zhenghenghuo/branch-two
...
fix some typos
(cherry picked from commit 38178cda41
2017-02-22 00:46:18 +01:00
Akihiro Suda
db2e6cbc86
Merge pull request #29693 from davidxia/fix-typo
...
Fix typo in docs
(cherry picked from commit fb03b56b9b
2017-02-22 00:46:12 +01:00
Sebastiaan van Stijn
25e8ff2b02
Merge pull request #29615 from londoncalling/docs-glossary-followup-PR#29561
...
followup to incorporate review comments per previous reviews on PR#29561
(cherry picked from commit b39b0c4596
2017-02-22 00:46:07 +01:00
Vincent Demeester
ba82978208
Merge pull request #29603 from mstanleyjones/docker_diff_improvements
...
Clarify what docker diff shows
(cherry picked from commit 0ca3e84227
2017-02-22 00:46:02 +01:00
Vincent Demeester
0e3248ebeb
Merge pull request #29600 from allencloud/update-docs-about-service-update
...
update service update in docs
(cherry picked from commit 524704143b
2017-02-22 00:45:56 +01:00
Brian Goff
d383ff9e4d
Merge pull request #29589 from lixiaobing10051267/masterDockerPs
...
field NAMES ommitted after docker ps in commit.md
(cherry picked from commit 9eb9abea6d
2017-02-22 00:45:49 +01:00
Sebastiaan van Stijn
23c03e1146
Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj
...
update docs about --oom-score-adj
(cherry picked from commit 0d93970c52
2017-02-22 00:45:43 +01:00
Sebastiaan van Stijn
199cd1e36e
Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win
...
updates to glossary re: d4mac, d4win, toolbox per user request
(cherry picked from commit fb41283e49
2017-02-22 00:45:37 +01:00
Misty Stanley-Jones
114aa22e97
Merge pull request #29559 from mstanleyjones/define_bridge
...
Define bridge networks
(cherry picked from commit c621fbce04
2017-02-22 00:45:30 +01:00
Vincent Demeester
8051adc7f3
Merge pull request #29541 from tim-zju/spellError
...
spell error: in other parts, they are lower-case
(cherry picked from commit 8a41c1d548
2017-02-22 00:45:20 +01:00
Vincent Demeester
a2ca630175
Merge pull request #29468 from hongbin/volume-plugin-fuxi
...
Add Fuxi Volume Plugin to the docs
(cherry picked from commit 13f45768f0
2017-02-22 00:45:09 +01:00
Victor Vieux
ce07fb6b0f
fix CHANGELOG date
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-19 21:03:35 -08:00
Victor Vieux
1c44f35eb1
bump 17.03.1-ce-rc1
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-19 21:02:06 -08:00
Victor Vieux
d1c1b391bc
Merge pull request #31170 from aboch/c1.13.x
...
[1.13.x/17.03.x] Vendoring libnetwork @ce28404
2017-02-19 15:42:59 -08:00
Sebastiaan van Stijn
8b1112be3b
Merge pull request #31165 from vieux/update_version_client
...
[1.13] update client/client.go DefaultVersion
2017-02-19 13:57:04 -08:00
Alessandro Boch
855eb121aa
Vendoring libnetwork @ce28404
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-19 13:35:31 -08:00
Victor Vieux
eb04072245
update client/client.gg DefaultVersion
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-19 01:26:16 -08:00
Victor Vieux
c9e1a9e16d
Merge pull request #31150 from thaJeztah/1.13.2-completion-scripts
...
17.03 bash/zsh completion script cherry-picks
2017-02-19 00:46:42 -08:00
Victor Vieux
c9ae02ec59
Merge pull request #31143 from aaronlehmann/vendor-swarmkit-caa9c95
...
[1.13] Vendor swarmkit 30a4278
2017-02-19 00:46:21 -08:00
Victor Vieux
19460e43f4
Merge pull request #31155 from justincormack/1.13-sync-file-range
...
[1.13] Allow sync_file_range2 on supported architectures.
2017-02-19 00:39:20 -08:00
Victor Vieux
2a46799a87
Merge pull request #31140 from thaJeztah/1.13.2-cherry-picks
...
17.03 cherry picks
2017-02-19 00:36:22 -08:00
Gabriel Linder
aedc0ca2fd
Allow sync_file_range2 on supported architectures.
...
Signed-off-by: Gabriel Linder <linder.gabriel@gmail.com>
2017-02-18 15:53:09 +00:00
Brian Goff
05516452d6
Merge pull request #30945 from sdurrheimer/zsh-completion-plugin
...
Add zsh completion for missing 'docker plugin' commands and options
(cherry picked from commit da9a162301
2017-02-18 00:14:30 -08:00
Brian Goff
b53cef8425
Merge pull request #30944 from sdurrheimer/zsh-completion-build-squash
...
Add zsh completion for 'docker build --squash'
(cherry picked from commit 0d9bb4ee12
2017-02-18 00:14:22 -08:00
Brian Goff
b975e02386
Merge pull request #30943 from sdurrheimer/zsh-completion-checkpoint
...
Add zsh completion for 'docker checkpoint' commands
(cherry picked from commit 4f6e4bfd02
2017-02-18 00:14:15 -08:00
Brian Goff
aaff3d513e
Merge pull request #30941 from sdurrheimer/zsh-completion-service-logs
...
Add zsh completion for 'docker service logs' command
(cherry picked from commit 03db46362e
2017-02-18 00:14:06 -08:00
Sebastiaan van Stijn
d4897c746f
Merge pull request #30940 from sdurrheimer/zsh-completion-swarm-unlock-cmds
...
Add zsh completion for 'docker swarm unlock|unlock-key' commands
(cherry picked from commit 27ab008626
2017-02-18 00:13:59 -08:00
Vincent Demeester
9287b8f99e
Merge pull request #30939 from sdurrheimer/zsh-completion-swarm-init-update
...
Add zsh completion for missing 'docker swarm init|update' options
(cherry picked from commit 5d47cb901b
2017-02-18 00:13:50 -08:00
Kenfe-Mickaël Laventure
7a02f05068
Merge pull request #30823 from albers/completion-plugin-upgrade
...
Add bash completion for `docker plugin upgrade`
(cherry picked from commit c9fa3eed1b
2017-02-18 00:13:31 -08:00
Sebastiaan van Stijn
d4e2280b0f
Merge pull request #31134 from thaJeztah/update-swagger
...
[1.13.x] swagger cherry-picks
2017-02-17 22:26:43 -08:00
Alexander Morozov
ecfddcf227
Merge pull request #29702 from WeiZhang555/stats-all-format-name-panic
...
Send "Name" and "ID" when stating stopped containers
(cherry picked from commit 22472c8be5
2017-02-17 22:15:04 -08:00
Sebastiaan van Stijn
b0e4cf1ad2
Merge pull request #31141 from thaJeztah/swarm-node-error-return-503
...
fix status-code for "locked" swarm and "certificate expired"
(cherry picked from commit 6486924f0b
2017-02-17 22:05:10 -08:00
Vincent Demeester
dffbf0bc73
Merge pull request #31103 from tonistiigi/update-docs-link
...
Update storage driver options link
(cherry picked from commit e1839ab953
2017-02-17 22:05:03 -08:00
Brian Goff
671a4aa4a4
Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin
...
Fix cpu spin waiting for log write events
(cherry picked from commit 39851eac0c
2017-02-17 22:04:56 -08:00
Brian Goff
46af6a6a41
Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy
...
Set 0444 as default secret mode in stack deploy
(cherry picked from commit a12454d7a9
2017-02-17 22:04:50 -08:00
Brian Goff
87a53468b2
Merge pull request #30113 from thaJeztah/fix-autoremove-on-older-api
...
Don't use AutoRemove on older daemons
(cherry picked from commit e74623d283
2017-02-17 22:04:44 -08:00
Victor Vieux
fe375a64db
Merge pull request #31055 from Microsoft/jjh/fix30278
...
Windows: Retry workaround for RS1/RS2 compute system enumeration
(cherry picked from commit 7761c69e23
2017-02-17 22:04:37 -08:00
Tõnis Tiigi
2e440580bc
Merge pull request #30223 from mlaventure/fix-logwatcher-deadlock
...
Close logwatcher on context cancellation
(cherry picked from commit 0566f3ffc4
2017-02-17 22:04:30 -08:00
Justin Cormack
4122443aa7
Merge pull request #30893 from Microsoft/jjh/disabletesttemporarily
...
Windows: Temporarily disable TestBuildLastModified
(cherry picked from commit eaffb3099a
2017-02-17 22:04:23 -08:00
