Antonio Murdaca
f03daf29dc
Merge pull request #13696 from hqhq/hq_add_comment_inspect
...
Add comment about inspect output
2015-06-03 13:36:00 +02:00
Qiang Huang
01a9a9284f
Add comment about inspect output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-03 17:35:57 +08:00
Qiang Huang
8bfc8102be
Don't check RESOURCE_COUNTERS in new kernel
...
Closes : #13543
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-03 17:26:39 +08:00
Qiang Huang
85fffe1341
Add docs for ip-forward
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-03 16:37:40 +08:00
Vincent Bernat
6d075aed02
test: don't invoke docker-machine directly
...
Use `machine` helper for that.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-06-03 10:30:34 +02:00
Vincent Bernat
3c16a870ac
exoscale: move job waiting into a separate function
...
Waiting for a job to complete is split into a dedicated function,
outside of `waitForVM()`. Functions only waiting for the job to complete
will use this new function instead. The "job is done" testing logic is
also casted into a separate function.
The original `waitForVM()` function is now waiting for the job to
complete, then retrieve the VM. This introduces an extra API call which
could be avoided by having a `waitForJob()` return the last response but
this makes the code simpler for other users and adding a special variant
just for that seems to be overkill.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-06-03 09:33:17 +02:00
Alexandre Beslic
178ae6f72a
Fix zookeeper List call, implement DeleteTree using List
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-03 00:18:52 -07:00
Vincent Bernat
2d25f56ff7
exoscale: use the new utils.WaitForSpecificOrError function to wait for job to finish
...
Instead of using a custom loop, use the newly introduced
`utils.WaitForSpecificOrError` function. Beware that on success, we use
the successful response to get the VM object (outside the loop).
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-06-03 09:09:07 +02:00
Vincent Bernat
2a60a4ea32
exoscale: ensure we sleep a bit while waiting for the VM to be ready
...
Otherwise, the timeout is reached far too soon: instead of waiting for
the VM for two minutes, we wait only for a couple of seconds.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-06-03 09:09:07 +02:00
Matt Moore
bd2575cc4f
Make the v2 logic fallback on v1 when v2 requests cannot be authorized.
...
Signed-off-by: Matt Moore <mattmoor@google.com >
2015-06-02 21:22:59 -07:00
Jessie Frazelle
63823cd6c1
Merge pull request #13683 from crosbymichael/nat-test-fixes
...
Fix nat integration tests
2015-06-02 18:54:17 -07:00
yuchangchun
e0475d331b
add a more accurate error description for invalid tag name
...
Signed-off-by: yuchangchun <yuchangchun1@huawei.com >
2015-06-03 09:38:39 +08:00
Michael Crosby
4f42097883
Fix nat integration tests
...
This removes complexity of current implementation and makes the test
correct and assert the right things.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-06-02 18:21:16 -07:00
Zefan Li
8b4c0decfc
Cleanup Daemon.verifyVolumesInfo() a bit
...
vols.VolumesRW has been initialized so it can't be nil. Furthermore
it's ok to read a nil map.
Signed-off-by: Zefan Li <lizefan@huawei.com >
2015-06-03 09:19:16 +08:00
Jessie Frazelle
25376c652d
Merge pull request #13679 from icecrime/update_vendoring
...
Update vendoring
2015-06-02 17:41:48 -07:00
Arnaud Porterie
1664d6cd66
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-02 16:41:02 -07:00
Victor Vieux
83f97f73e8
Merge pull request #886 from vieux/add_resources_test
...
fix resources in docker 1.7
2015-06-02 16:15:12 -07:00
Victor Vieux
7604d1cc30
add test
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-02 16:03:37 -07:00
Victor Vieux
e8e9d553a2
handle compat
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-02 15:39:12 -07:00
David Calavera
af09b06dfa
Merge pull request #13675 from runcom/13663-config-regression
...
Expose old config field for api < 1.19
2015-06-02 15:23:51 -07:00
Antonio Murdaca
6deaa58ba5
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-06-02 23:37:59 +02:00
Victor Vieux
79b128172d
update dockerclient to get new fields
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-02 14:36:24 -07:00
Victor Vieux
d6bd288fb0
add docker run not enough resources test
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-02 14:35:58 -07:00
David Calavera
6c42b3947a
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
2015-06-02 14:12:22 -07:00
Alexander Morozov
3f26066425
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
2015-06-02 14:05:29 -07:00
Ahmet Alp Balkan
4e3b21f99e
Allow duration strings as --since/--until
...
Fixes #13107 . This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.
Added unit tests for pkg/timeutils.GetTimestamp as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-06-02 21:02:47 +00:00
Stephen Day
4e1280405a
Merge pull request #580 from gierschv/spec
...
doc/spec: coherence between requests and parameters + typo
2015-06-02 13:57:56 -07:00
Doug Davis
da255ec962
Merge pull request #13661 from vdemeester/pkg-jsonmessage-test-coverage
...
Add test coverage to pkg/jsonmessage
2015-06-02 16:54:50 -04:00
Evan Hazlett
4a54559233
Merge pull request #1280 from ehazlett/native-ssh-fix
...
fix issue with native ssh; fix tty allocation for redhat
2015-06-02 16:48:02 -04:00
Sebastiaan van Stijn
7e8639a9df
Merge pull request #13671 from moxiegirl/carry-13147-fix
...
Tweaking text identified in PR #13147
2015-06-02 21:48:47 +02:00
Alexander Morozov
3df19749d4
Wrap lines for journald docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-02 12:46:51 -07:00
Mary Anthony
cb4af853f6
Tweaking text identified in PR #13147
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-02 12:44:47 -07:00
Alexander Morozov
8979fe4d8a
Change address to syslog-address in syslog docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-02 12:44:23 -07:00
Alexander Morozov
a81af2e26a
Add syslog-tag option for syslog log-driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-02 12:43:00 -07:00
Vincent Demeester
e6bd8c1e19
Add test coverage to pkg/jsonmessage
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-02 21:19:38 +02:00
Phil Estes
63b5d5fadc
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
2015-06-02 15:04:38 -04:00
Evan Hazlett
c268b263a3
Merge pull request #1158 from nathanleclaire/integration_cleanup
...
Refactor integration tests
2015-06-02 14:46:44 -04:00
David Calavera
ad244668c3
Update libnetwork to 4ded6fe3641b71863cc5985652930ce40efc3af4
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-02 11:30:36 -07:00
Phil Estes
278798236b
Merge pull request #13650 from jvgogh/master
...
Upon HTTP 302 redirect do not include "Authorization" header on 'untr…
2015-06-02 14:23:20 -04:00
Jeffrey Morgan
c43a8d5a69
Adding errors for non-200 api responses
2015-06-02 11:23:12 -07:00
Alexandre Beslic
d53ae5b50c
Merge pull request #892 from vieux/images
...
add images to docker info
2015-06-02 11:22:57 -07:00
Arnaud Porterie
274baf70bf
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
2015-06-02 11:16:23 -07:00
Jessie Frazelle
7d33bc0bec
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
2015-06-02 11:05:22 -07:00
David Calavera
ad41efd9a2
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-02 11:00:54 -07:00
Victor Vieux
fb63a90610
add images to docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-02 10:53:19 -07:00
David Calavera
814a92c5a1
Merge pull request #13607 from vieux/PrintfIfNotEmpty
...
do not print empty values in docker info
2015-06-02 10:52:45 -07:00
Nathan LeClaire
ed01843dc9
Refactor integration tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-06-02 10:10:52 -07:00
Sebastiaan van Stijn
bdb6fad34c
Merge pull request #13654 from porjo/netipv6
...
Networking docs: add reference to ndppd
2015-06-02 19:06:17 +02:00
Doug Davis
38393b63b7
Round 3 - Add Register function
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-02 10:01:21 -07:00
Arnaud Porterie
2de2782fe8
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
2015-06-02 09:40:55 -07:00