Mazz Mosley
cd2cdb25e3
Merge pull request #1631 from aanand/add-mazz-to-maintainers
...
Add Mazz to MAINTAINERS
2015-07-02 14:20:39 +01:00
Sebastiaan van Stijn
ddc9bc6c56
Merge pull request #14341 from ankushagarwal/ubuntuUglyDocs
...
Fix missing newline
2015-07-02 15:17:27 +02:00
moxiegirl
5185c9f70a
Merge pull request #1619 from AndyWendt/patch-1
...
Added uninstall documentation for pip and curl
2015-07-02 06:07:59 -07:00
Xian Chaobo
83d1f65e85
fix attach websocket test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-07-02 08:13:52 -04:00
Moysés Borges
8b0e40bb38
Fixed outdated comment.
...
Synchronized the comment for httputils/mimetype.DetectContentType
with the actual code.
Signed-off-by: Moysés Borges <moysesb@gmail.com >
2015-07-02 08:17:11 -03:00
Qiang Huang
af7f81878f
Show error message when todisk failed
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-02 18:24:35 +08:00
Victor Vieux
34636b29fc
Merge pull request #1018 from mountkin/fix-1006
...
update deps
2015-07-01 21:45:54 -07:00
Ahmet Alp Balkan
6113e89004
Use os.Unsetenv in options_test
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-07-01 20:25:52 -07:00
Shijiang Wei
8bfac6bd71
update deps
...
Fixes https://github.com/docker/swarm/issues/1006
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-07-02 11:11:29 +08:00
Ma Shimiao
f38232b475
Unify docker commands' usage in man and help
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-02 10:33:26 +08:00
Ankush Agarwal
942a0f994f
Fix missing newline
...
Fixes #14340
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-01 18:16:22 -07:00
Victor Vieux
930fefc06d
Merge pull request #1013 from moxiegirl/fix-issue-997
...
Switch to install
2015-07-01 17:50:32 -07:00
Victor Vieux
895d820774
Merge pull request #964 from jimenez/task_timeout_flag
...
making task timeout configurable
2015-07-01 16:51:33 -07:00
Sebastiaan van Stijn
98f988f62c
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
2015-07-02 01:31:15 +02:00
Sebastiaan van Stijn
f51d77f86e
Merge pull request #12548 from camallen/docker_host_docs
...
add note in docs about DOCKER_HOST env var overriding unix socket config
2015-07-02 01:27:47 +02:00
Isabel Jimenez
305050025c
making task timeout configurable
...
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com >
2015-07-01 18:58:17 -04:00
Victor Vieux
2b4562482f
Merge pull request #1014 from abronan/remove_consul_config
...
Fix storage integration tests
2015-07-01 15:39:53 -07:00
Victor Vieux
396f6d3466
Merge pull request #1011 from aluzzardi/upgrade-golang
...
Upgrade golang version (1.3 -> 1.4).
2015-07-01 15:39:11 -07:00
Andrea Luzzardi
12ba56e62e
Merge pull request #1015 from vieux/skip_attach_websocket
...
skip test: docker attach through websocket
2015-07-01 15:38:12 -07:00
Victor Vieux
f80556ce9c
Merge pull request #1012 from vieux/disable_mesos_tests
...
disable mesos tests because mesos is incompatible with the next version of docker
2015-07-01 15:36:40 -07:00
Alexander Morozov
75864dcb38
Merge pull request #14324 from aboch/ds
...
Stats API to retrieve nw stats from libnetwork
2015-07-01 15:19:46 -07:00
Victor Vieux
311af01992
Merge pull request #968 from aluzzardi/bump-0.4.0
...
Bump version to 0.4.0
2015-07-01 15:11:29 -07:00
Derek McGowan
3531b22b46
Add challenge manager interface
...
Challenger manager interface is used to handle getting authorization challenges from an endpoint as well as extracting challenges from responses.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-01 15:00:25 -07:00
Derek McGowan
c8fac94617
Separate version and challenge parsing from ping
...
Replace ping logic with individual functions to extract API version and authorization challenges. The response from a ping operation can be passed into these function. If an error occurs in parsing, the version or challenge will not be used. Sending the ping request is the responsibility of the caller.
APIVersion has been converted from a string to a structure type. A parse function was added to convert from string to the structure type.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-01 15:00:25 -07:00
Derek McGowan
5a7dab4670
Refactor client auth
...
Move client auth into a separate package.
Separate ping from the authorizer and export Challenges type.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-01 15:00:25 -07:00
Fred Lifton
67628d45c1
Add note to ensure SSH access to DTR host
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
2015-07-01 14:24:41 -07:00
Alexander Morozov
9b9a4b2e59
Merge pull request #14329 from runcom/14318-fix-regression-cap-add-drop-as-single-string
...
Fix regression in parsing capabilities
2015-07-01 13:28:07 -07:00
Brian Goff
1751b40b04
Merge pull request #14333 from LK4D4/fix_tags
...
Fix windows tag in pkg/term
2015-07-01 16:27:57 -04:00
Thomas Sjögren
9b42de0e57
remove bashism
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
2015-07-01 22:19:24 +02:00
Alexander Morozov
7b3492df0c
Fix windows tag in pkg/term
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-01 13:16:16 -07:00
Thomas Sjögren
21ec389fe1
mention the daily experimental build
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
2015-07-01 22:12:57 +02:00
Antonio Murdaca
10a3061c5f
Fix regression in parsing capabilities list when a single string is given
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-01 21:28:02 +02:00
Don Reilly
d71978a4ba
Clairify port usage in multi-manager-setup.md
...
Signed-off-by: Don Reilly <dreilly1982@gmail.com >
2015-07-01 13:20:04 -05:00
Alessandro Boch
8b40e44c39
Stats API to retrieve nw stats from libnetwork
...
- Container networking statistics are no longer
retrievable from libcontainer after the introduction
of libnetwork. This change adds the missing code
for docker daemon to retireve the nw stats from
Endpoint.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-07-01 11:15:16 -07:00
Alexander Morozov
358c022cac
Merge pull request #14321 from MattHauglustaine/14266-return-envfile-parse-bufio-error
...
Return bufio error when parsing env file
2015-07-01 11:06:33 -07:00
Alexander Morozov
53b897ce9c
Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit
...
Support LABEL as change for `docker commit`
2015-07-01 10:57:33 -07:00
Brian Goff
5fd0563505
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
2015-07-01 13:22:03 -04:00
Alexander Morozov
be5e1498c3
Merge pull request #14134 from vdemeester/runconfig-test-coverage
...
Refactor and add tests coverage on package runconfig
2015-07-01 10:15:26 -07:00
Mazz Mosley
f0dd63d5bc
Don't use future tense
...
As per style-guide, future tense is not necessary.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 18:06:09 +01:00
Mazz Mosley
9549bd0539
Initial cap Docker
...
Use lowercase docker only when referencing a command/daemon
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 18:05:21 +01:00
Mazz Mosley
f33f673b49
Allow _.- chars in service names
...
As VALID_CHARS is shared with project names, these chars are also
now allowed within project names.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 17:57:50 +01:00
Mazz Mosley
8cf84ea552
Fix missing image names
...
These tests were indeed raising a config error, but not for the reason
intended/tested for. I've added in the image name so the config error
raise is correctly testing the Service name.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 17:57:50 +01:00
Antonio Murdaca
88d32a6109
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-01 18:16:17 +02:00
Shishir Mahajan
2cb74e6915
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-07-01 12:14:01 -04:00
David Calavera
1d7a62d776
Merge pull request #14314 from sunyuan3/TestRmiBlank
...
Add the expected error verification for TestRmiBlank.
2015-07-01 09:09:56 -07:00
David Calavera
d02540a44a
Merge pull request #14305 from aboch/nwst
...
Import latest libnetwork
2015-07-01 09:07:40 -07:00
Matthieu Hauglustaine
0dadf11bec
Add unit tests for ParseEnvFile.
...
Add unit tests of the ParseEnvFile function. Test for:
* good file
* empty file
* non existent file
* badly formatted file
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:43:03 +02:00
Mazz Mosley
8a47791161
Re-arrange for the more common case
...
boot2docker is the more common case so let's have that one first.
Also be more explicit and clear that the localhost:5000 is applicable
for people running on linux.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 16:20:29 +01:00
Mazz Mosley
ab03f2310b
Include zsh shell
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 16:20:29 +01:00
Mazz Mosley
94ecc515d3
Link to docker's contrib workflow
...
This will aid people in how to make pull requests for code and docs.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-01 16:20:29 +01:00