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
Alexander Morozov
e301d956b7
Merge pull request #30776 from WeiZhang555/stats-all-format-name-panic-cli
...
Fix panic of "docker stats --format {{.Name}} --all"
(cherry picked from commit f5116c6802
2017-02-17 22:04:16 -08:00
Sebastiaan van Stijn
1c47c89d76
Merge pull request #29497 from yongtang/29486-docker-build-tmp-file
...
Clean up tmp files for interrupted `docker build`
(cherry picked from commit 6138a02c87
2017-02-17 22:03:36 -08:00
Victor Vieux
7e11df6273
Merge pull request #31138 from aboch/c1.13.x
...
[1.13.x] Release the network attachment on allocation failure
2017-02-17 18:18:46 -08:00
Aaron Lehmann
b326920b3e
Vendor swarmkit 30a4278
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-17 17:46:12 -08:00
Sebastiaan van Stijn
56e99a8791
fix changes for 1.13.x branch
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-17 17:21:58 -08:00
Alessandro Boch
9e74ea8594
Release the network attachment on allocation failure
...
- otherwise the attachment task will stay in store and
consume IP addresses and there is no way to remove it.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-17 16:05:49 -08:00
Brian Goff
740fbef836
Merge pull request #30952 from yongtang/02122017-swagger-attachable
...
Add `attachable` for network object in swagger api docs
(cherry picked from commit 0464441fb1
2017-02-17 13:24:41 -08:00
Vincent Demeester
9dcb36dfa2
Merge pull request #30734 from allencloud/add-400-status-code-for-events-endpoint
...
add status code 400 for api endpoint /events
(cherry picked from commit f3da980a45
2017-02-17 13:24:41 -08:00
allencloud
9f46122c94
add missing filter type and sort filter type in alphabets
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit da1f05d66d
2017-02-17 13:24:41 -08:00
Anusha Ragunathan
951ffc056b
Merge pull request #30701 from allencloud/add-status-code-404-for-plugin-in-api-doc
...
add status code 404 for plugin api endpoint enable and disable
(cherry picked from commit 0113128b2a
2017-02-17 13:24:40 -08:00
Sebastiaan van Stijn
ed6e849a1c
Merge pull request #29906 from allencloud/update-events-related-things
...
update events related doc and swagger.yml
(cherry picked from commit dea528e8cd
2017-02-17 13:24:40 -08:00
Sebastiaan van Stijn
e7e23df3f6
Merge pull request #29808 from jmzwcn/issue29796
...
API: Delete container can return 409, but that isn't documented.
(cherry picked from commit 86f962a4a8
2017-02-17 13:24:40 -08:00
Sebastiaan van Stijn
890f4c7aa5
Merge pull request #26576 from allencloud/change-cluster-response-status-code
...
update response status code for cluster request
(cherry picked from commit a58b5830b1
2017-02-17 13:24:24 -08:00
