Kenfe-Mickael Laventure
e285c70dec
Bump runc to a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-23 01:05:38 -08:00
Victor Vieux
49849eda4a
Merge pull request #31270 from thaJeztah/17.03-cherry-pick-29076
...
[17.03] Block obsolete and unusual socket families in the default seccomp profile
2017-02-22 22:56:55 -08:00
Victor Vieux
d06b03a99d
Merge pull request #31274 from tonistiigi/update-containerd
...
[17.03.x] vendor: update containerd to 977c511ed
2017-02-22 19:38:23 -08:00
Victor Vieux
455ebb8892
Merge pull request #31271 from thaJeztah/cherry-pick-changelog-validation
...
[17.03] Cherry pick changelog validation
2017-02-22 19:38:05 -08:00
Victor Vieux
d77ec85abc
Merge pull request #31275 from thaJeztah/17.03-swagger-cherry-picks
...
17.03 swagger cherry picks
2017-02-22 18:26:57 -08:00
Victor Vieux
44aec1b692
add -ce support
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 17:38:37 -08:00
Victor Vieux
f2738cd135
Merge pull request #31277 from thaJeztah/17.03-update-authors
...
[17.03.x] update authors
2017-02-22 17:32:06 -08:00
Victor Vieux
716c92c6ae
Merge pull request #31276 from thaJeztah/update-authors
...
Update authors
(cherry picked from commit 1948cc5fac
2017-02-23 02:26:36 +01:00
Victor Vieux
c984bbf871
Merge pull request #31203 from yongtang/02202017-Swagger-ContainerSpec
...
Add missing fields in Swagger docs
(cherry picked from commit 19cd2aa389
2017-02-23 01:05:54 +01:00
Tonis Tiigi
c7f67ed835
vendor: update containerd to 977c511ed
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-22 16:04:23 -08:00
Sebastiaan van Stijn
cecae2c5ad
Merge pull request #31204 from yongtang/31179-Swagger-Secrets
...
Add missing Secrets in Swagger docs
(cherry picked from commit cf8408106d
2017-02-23 00:57:24 +01:00
Vincent Demeester
350ecb34e9
Merge pull request #30954 from yongtang/29448-swagger-version
...
Improve documentation of `Version` usage for Swarm API
(cherry picked from commit 89fe0e1b14
2017-02-23 00:56:22 +01:00
Kenfe-Mickaël Laventure
3804b6d408
Merge pull request #30391 from andrewhsu/check-changelog-date
...
validate CHANGELOG.md dates are in descending order
(cherry picked from commit 5e74dc11e3
2017-02-23 00:38:39 +01:00
Vincent Demeester
39781f92b3
Merge pull request #29208 from andrewhsu/validate-changelog
...
validate CHANGELOG.md is well-formed
(cherry picked from commit 59ba895a0f
2017-02-23 00:37:43 +01:00
Sebastiaan van Stijn
1235b56fbc
Merge pull request #29076 from justincormack/seccomp-socket-to-them
...
Block obsolete and unusual socket families in the default seccomp profile
(cherry picked from commit 48184351c9
2017-02-23 00:27:29 +01:00
Victor Vieux
9fb5c83df0
Merge pull request #31205 from vieux/update_changelog_17.03
...
update CHANGELOG for 17.03.0-ce
2017-02-22 15:05:27 -08:00
Victor Vieux
fa43a64f9c
update CHANGELOG for 17.03.0-ce
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 12:03:09 -08:00
Vincent Demeester
d7bc6e4e7c
Merge pull request #31242 from thaJeztah/17.03-docs-cherry-picks
...
17.03 docs cherry picks
2017-02-22 11:13:07 +01:00
Vincent Demeester
f6b33c65d5
Merge pull request #31034 from erxian/refine-service-update-document
...
add rollback explanation to docker service update command document
(cherry picked from commit 75843d36aa
2017-02-22 00:49:16 +01:00
Sebastiaan van Stijn
23de3ee83b
Merge pull request #31023 from mstanleyjones/fix_liquid_errors
...
Fix some Liquid errors
(cherry picked from commit 88de5c36c7
2017-02-22 00:49:10 +01:00
Sebastiaan van Stijn
93daa00ee6
Merge pull request #30965 from YuPengZTE/devDes
...
fix typo
(cherry picked from commit a8f4d82176
2017-02-22 00:49:03 +01:00
Sebastiaan van Stijn
1f1b15ae4c
Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal
...
Add missing link in deprecated.md
(cherry picked from commit b5b6752230
2017-02-22 00:48:56 +01:00
Sebastiaan van Stijn
411ff56edf
Merge pull request #30921 from anusha-ragunathan/debug_docs
...
Add plugin socket related debug docs.
(cherry picked from commit fddab1444f
2017-02-22 00:48:50 +01:00
Sebastiaan van Stijn
fdd29d9085
Merge pull request #30898 from allencloud/add-link-query-in-container-rm-api-doc
...
add link query in container rm api doc
(cherry picked from commit b89aff1afa
2017-02-22 00:48:39 +01:00
Sebastiaan van Stijn
c611906062
Merge pull request #30804 from mstanleyjones/cli_fixups
...
Cli fixups
(cherry picked from commit 40dbbd3f9b
2017-02-22 00:48:21 +01:00
Sebastiaan van Stijn
8893cd6095
Merge pull request #30802 from anusha-ragunathan/debug_docs
...
Add plugin debug docs.
(cherry picked from commit d4be5a2f67
2017-02-22 00:48:15 +01:00
Sebastiaan van Stijn
f64a1832bd
Merge pull request #30789 from vdemeester/carry-update-docker-stack-experimental
...
Update docker stack experimental notes
(cherry picked from commit c5a592a0a4
2017-02-22 00:48:10 +01:00
Sebastiaan van Stijn
0a506d9429
Merge pull request #30774 from aaronlehmann/swarm-leave-docs-fix
...
Fix grammatical error in swarm_leave.md
(cherry picked from commit 9e80a2a457
2017-02-22 00:48:04 +01:00
Sebastiaan van Stijn
f28a1d3c23
Merge pull request #30663 from Mashimiao/reference-cmdline-service-tfix
...
reference/commandline: small tfix
(cherry picked from commit 32697b57c8
2017-02-22 00:47:59 +01:00
Vincent Demeester
e795408586
Merge pull request #30620 from thaJeztah/carry-29590
...
some grammatical errors
(cherry picked from commit deb0885419
2017-02-22 00:47:53 +01:00
Vincent Demeester
56da5fa29b
Merge pull request #30619 from johndmulhausen/patch-3
...
Fix for 404 in docs
(cherry picked from commit 1de72681b5
2017-02-22 00:47:45 +01:00
Sebastiaan van Stijn
84f026ba7e
Merge pull request #30553 from lewisdaly/21050-improve-user-namespace-docs
...
Updated dockerd docs with note about user namespaces
(cherry picked from commit d6b1b532a1
2017-02-22 00:47:39 +01:00
Sebastiaan van Stijn
492f2ab8fe
Merge pull request #30524 from mstanleyjones/30149_update_plugin_apidocs
...
Update plugin_volume apidocs for v2
(cherry picked from commit 3dc87714d1
2017-02-22 00:47:33 +01:00
Misty Stanley-Jones
137b05e9f5
Merge pull request #30523 from nathanleclaire/document_init
...
Document --init flag for docker run
(cherry picked from commit e0cc664cc3
2017-02-22 00:47:27 +01:00
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
