Daniel Nephin
02535f0cf1
Fix validation message when there are multiple ested oneOf validations.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-19 14:22:55 -05:00
Arnaud Porterie
9d70aef2c7
Merge pull request #20511 from icecrime/skip_flaky_test
...
Temporarily skip TestAuthZPluginAllowEventStream
2016-02-19 10:57:30 -08:00
Tonis Tiigi
64530c8e47
Fix releasing reference on deletion error
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-02-19 10:42:29 -08:00
Daniel Nephin
c7ceacfeae
Merge pull request #2948 from dnephin/validate_top_level
...
Validate that each section of the config is a mapping
2016-02-19 13:41:50 -05:00
Arnaud Porterie
6e0f873f05
Temporarily skip TestAuthZPluginAllowEventStream
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2016-02-19 10:32:05 -08:00
Aanand Prasad
bed0cfeb32
Merge pull request #2807 from aanand/swarm-doc
...
Update Swarm integration guide and make it an official part of the docs
2016-02-19 10:25:28 -08:00
Tibor Vass
aa1fdf42da
Merge pull request #20253 from aaronlehmann/smarter-tls-fallback
...
Smarter push/pull fallback from TLS to plaintext
2016-02-19 13:16:53 -05:00
Daniel Nephin
0d218c34c7
Make config validation error messages more consistent.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-19 13:12:57 -05:00
Phil Estes
074561b0ec
Clean up authz integration-cli test
...
- Order the flow of the handlers more cleanly--read req, do actions,
write response.
- Add "always allowed" endpoints to handle `/_ping` and `/info` usage
from the test framework/daemon start/restart management
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2016-02-19 10:12:39 -08:00
Daniel Nephin
4b2a666231
Validate that each section of the config is a mapping before running interpolation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-19 12:38:52 -05:00
Aanand Prasad
520c695bf4
Update Swarm integration guide and make it an official part of the docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-02-19 09:32:43 -08:00
Aanand Prasad
1f2c2942d7
Merge pull request #2963 from londoncalling/docs-alias-repr2829
...
corrected description of network aliases, added real-world example pe…
2016-02-19 09:26:40 -08:00
Vincent Demeester
06af9471f8
Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs
...
Fix some flaws in docs
2016-02-19 17:07:50 +01:00
Sebastiaan van Stijn
d6576ad9f0
Merge pull request #20504 from fuzzbomb/20503-document-names-format-placeholder-docker-ps-man-page
...
Document .Names format placeholder in docker-ps man page, fixes #20503 .
2016-02-19 16:34:23 +01:00
Andrew Macpherson
22d22eb9e1
Document .Names format placeholder in docker-ps man page, fixes #20503 .
...
Signed-off-by: Andrew Macpherson <hopscotch23@gmail.com >
2016-02-19 15:13:34 +00:00
Sebastiaan van Stijn
787fe507bf
Merge pull request #20479 from qunhu/master
...
fix docs
2016-02-19 15:55:33 +01:00
Jean-Laurent de Morlhon
568e1b6a6e
Merge pull request #3088 from jmelis/master
...
Add OpenNebula Driver Plugin
2016-02-19 15:32:34 +01:00
Michal Gebauer
b9302b3043
Typo docker-machine -f is shortcut for --format
...
Signed-off-by: Michal Gebauer <mishak@mishak.net >
2016-02-19 15:25:55 +01:00
Sebastiaan van Stijn
33997ba69c
Merge pull request #20487 from wenchma/typo-error
...
Fix typo error of dockernetworks.md
2016-02-19 15:24:59 +01:00
Jaime Melis
71bf6ed6cf
Add OpenNebula Driver Plugin
...
Signed-off-by: Jaime Melis <jmelis@opennebula.org >
2016-02-19 13:05:12 +01:00
Sebastiaan van Stijn
0adeae325e
Remove tutorials from Dockerfile
...
The "docker/tutorials" repository is now
private, causing building the docs to fail.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-02-19 13:02:06 +01:00
Sebastiaan van Stijn
f9aca81b67
Update Swarm API documentation
...
This updates the Swarm API documentation;
- Fix heading levels (changed H1 -> H2)
- Replace the "Endpoints which behave differently" with a table
- Fix Markdown markup in "Registry Authentication" section
- Changed the "Registry Authentication" examples from a bullet-list
to sub-sections and promoted "token-based authentication" as the preferred
authentication method (adding notes that password-based authentication
stores credentials unencrypted)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-02-19 12:59:58 +01:00
Zhang Wei
439433099e
Clean redundant error message for export
...
When execute `docker export -o path xxx` and path is a directory docker
has no privilege to write to, daemon will print lots of error logs that
most of them are duplicated and redundant.
This will remove unnecessary error logs and print only once.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-02-19 18:50:11 +08:00
thibault deheurles
58913ce8ae
Fix issue 368
...
Signed-off-by: Thibault Deheurles <tdeheurles@gmail.com >
2016-02-19 11:29:39 +01:00
Wen Cheng Ma
f03050cc4c
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-02-19 17:18:52 +08:00
Jean-Laurent de Morlhon
e28bfc55e0
Merge pull request #3017 from hypriot/set-longmode-on
...
Add option --longmode on to support Windows 32bit hosts
2016-02-19 09:36:17 +01:00
Stefan Scherer
c40f9f7a21
Add option --longmode on to support Windows 32bit hosts
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
2016-02-19 08:51:24 +01:00
Jean-Laurent de Morlhon
2a95370032
Merge pull request #3085 from dgageot/improve-doc-generic
...
Improve Generic driver doc
2016-02-19 08:32:29 +01:00
David Gageot
742c87ee3f
Improve Generic driver doc
...
Signed-off-by: David Gageot <david@gageot.net >
2016-02-19 07:25:31 +01:00
huqun
b96bbf26db
fix docs
...
Signed-off-by: huqun <huqun@zju.edu.cn >
2016-02-19 13:51:14 +08:00
Jeffrey Morgan
6674e8cd9e
Merge pull request #422 from SvenDowideit/fix-overview-link
...
Fix link to overview topic
2016-02-18 20:44:56 -08:00
Ying Li
b8866877b0
Clarify test comment
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-02-18 18:59:14 -08:00
Victoria Bialas
753c953870
Merge branch 'docs-alias-repr2829' of github.com:londoncalling/compose into docs-alias-repr2829
...
Fixed file format of one word, legacy, adding signature to that commit.
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
2016-02-18 18:32:44 -08:00
French Ben
856a989d83
Merge pull request #1477 from dongjoon-hyun/fix_typos
...
Fix typos in comments of src/utils.
2016-02-18 18:21:05 -08:00
Victoria Bialas
eb4a98c0d1
corrected description of network aliases, added real-world example per #2907
...
copyedit to make show as file format
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
2016-02-18 18:05:52 -08:00
Victoria Bialas
630a50295b
copyedit to make show as file format
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
2016-02-18 18:05:30 -08:00
Dong Chen
69535f167a
Do not recycle connections. Let net/http handles connections.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-02-18 18:02:10 -08:00
Victoria Bialas
068a56eb97
corrected description of network aliases, added real-world example per #2907
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
2016-02-18 17:49:28 -08:00
Riyaz Faizullabhoy
3a5fbf0033
remove path hash prefix from TargetsDelegations
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-18 17:40:50 -08:00
Arnaud Porterie
117a982d2e
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
2016-02-18 17:39:46 -08:00
Jian Zhang
cdc7f26715
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
2016-02-19 09:27:03 +08:00
David Calavera
c96564a76c
Merge pull request #20433 from runcom/fixies
...
runconfig: opts: parse: lowercase errors
2016-02-18 17:08:01 -08:00
Arnaud Porterie
7068722678
Merge pull request #20458 from aaronlehmann/migration-close-gzip-writer
...
Close tarsplit gzip writer when creating tar-split.json.gz files during layer migration
2016-02-18 16:48:50 -08:00
David Lawrence
e270795768
updates and bugfixes for go 1.6
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-02-18 16:45:40 -08:00
Sven Dowideit
01c4f0d54e
Fix link to overview topic
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2016-02-18 16:20:29 -08:00
Joffrey F
5fc0df4be2
Merge pull request #2907 from shin-/2829-net-alias
...
Allow user to specify custom network aliases
2016-02-18 16:01:30 -08:00
Arnaud Porterie
6a8342d63d
Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts
...
Check in latest Win2Lin Jenkins scripts
2016-02-18 15:58:24 -08:00
Joffrey F
0cb8ba3775
Use modern set notation in _get_aliases
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-02-18 15:28:12 -08:00
Joffrey F
7152f7ea76
Handle mismatched network formats in config files
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-02-18 15:24:41 -08:00
Joffrey F
825a0941f0
Network aliases are now part of the network dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-02-18 15:23:47 -08:00