Aanand Prasad
c1b9a76a54
Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image
...
Fix smart recreate when 'image' is changed to something nonexistent
(cherry picked from commit 2bc10db545 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:25:33 +01:00
Aanand Prasad
c31e25af72
Merge pull request #1642 from aanand/fix-1573
...
Fix bug where duplicate container is leftover after 'up' fails
(cherry picked from commit f42fd6a3ad )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:25:03 +01:00
Aanand Prasad
c8295d36cc
Merge pull request #1644 from aanand/fix-rm-bug
...
Stop 'rm' and 'ps' listing services not defined in the current file
(cherry picked from commit d85688892c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:24:15 +01:00
Aanand Prasad
b12c29479e
Merge pull request #1521 from dano/validate-service-names
...
Validate that service names passed to Project.containers aren't bogus.
(cherry picked from commit bc14c473c9 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:24:15 +01:00
Alexander Morozov
bc6ad1608c
Don't use time.After if there is no timeout
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-14 09:14:51 -07:00
Alexander Morozov
7080f5d1cf
Add docstring to pubsub.Publisher
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-14 09:10:14 -07:00
Aanand Prasad
1e71eebc74
Merge pull request #1688 from aanand/use-docker-py-1.3.0
...
Use docker-py 1.3.0
2015-07-14 16:55:44 +01:00
Aanand Prasad
fdc34a187e
Use docker-py 1.3.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 16:17:12 +01:00
Jessie Frazelle
cf09e435c8
Merge pull request #14608 from vincentbernat/fix/zsh-reviewers
...
zsh: remove Vincent Bernat from reviewers for ZSH completion
2015-07-14 07:08:06 -07:00
Bryan Boreham
34202f55ce
Add -f flag to git push after rebase
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
2015-07-14 14:06:13 +01:00
James Turnbull
aaf1426995
Merge pull request #14494 from HuKeping/update-docs
...
docs: update docs for API history
2015-07-14 08:16:00 -04:00
Hu Keping
29660f263e
docs: update docs for API history
...
The response of hitory API includes more information now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-14 19:54:24 +08:00
Steve Durrheimer
91a2d9cc7d
Several cosmetic improvements in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-07-14 11:34:33 +02:00
Steve Durrheimer
12f67141f9
Zsh completion update for the following commits:
...
- Add fluentd logging driver to zsh completion #12876
- Add inspect --type flag to zsh completion #13187
- Respect -H option in zsh completion #13195
- Fix number of argument limit for pause and unpause in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-07-14 11:32:26 +02:00
Diogo Monica
321b155596
Godeps update, removed dependency on rufus
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-14 00:39:03 -07:00
Jeffrey Morgan
b16944d30e
Fix broken custom install location button
2015-07-14 00:38:29 -07:00
Diogo Monica
f03626a10e
Refactored Rufus API
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-14 00:23:38 -07:00
Diogo Monica
9a4c2dc744
Initial copy of notary-signer
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-14 00:23:22 -07:00
Jeffrey Morgan
dd0c4fd3c2
Fix wording & centering
2015-07-14 00:17:12 -07:00
Jeffrey Morgan
10ecaa6f6e
Merge branch 'master' of github.com:docker/toolbox
2015-07-14 00:11:06 -07:00
Jeffrey Morgan
9c45387256
Fix bash startup script on mac
2015-07-14 00:10:36 -07:00
Qiang Huang
a7f5e1c4c3
Remove cgroup read-only flag when privileged
...
Fixes : #14543
It needs libcontainer fix from:
https://github.com/opencontainers/runc/pull/91
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-14 15:00:41 +08:00
Vincent Demeester
4290bdefab
Add dockerCmdWithError
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-14 08:35:06 +02:00
Sebastiaan van Stijn
daffcc044b
Merge pull request #14458 from hqhq/hq_fix_docs_create
...
Docs: fix commandline doc create.md and run.md
2015-07-14 08:10:41 +02:00
Qiang Huang
19c7b65ea6
Add hostConfig check for MemorySwappiness
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-14 13:52:57 +08:00
Diogo Monica
ead0224526
Removing commented out code
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-13 20:32:51 -07:00
David Lawrence
b8674162f8
Merge pull request #44 from endophage/atomic_update
...
Atomic updates of metadata.
2015-07-13 20:23:01 -07:00
Brian Goff
154820aca6
Merge pull request #14595 from LK4D4/pubsub_bench
...
Benchmark and race test for pkg/pubsub
2015-07-13 23:04:44 -04:00
Jason Green
59aa3b27ca
Add missing periods to elements in ROADMAP.md
...
Signed-off-by: Jason Green <Jason.Green@AverInformatics.Com >
2015-07-13 23:01:34 -04:00
David Lawrence
0f26bdf956
adding errors if role is empty or bad
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-13 19:50:09 -07:00
David Lawrence
6dd18754b2
Merge pull request #48 from endophage/db_schema
...
refactoring database schema out into its own file
2015-07-13 18:45:45 -07:00
Qiang Huang
c3b77bbe8b
Docs: fix commandline doc create.md and run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-14 09:26:59 +08:00
David Lawrence
81ab80d0bf
adding sqlmock godep
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-13 18:19:31 -07:00
David Lawrence
6533da1be4
tests for atomic update
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-13 18:19:31 -07:00
David Lawrence
5bcd3ff52d
reworking the insert check for TUF metadata in the database
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-13 18:18:33 -07:00
David Lawrence
40921a4bed
fixing lint and vet errors
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-13 18:18:33 -07:00
David Lawrence
ec08d28610
provide an additional handler to allow clients to update any set of TUF metadata atomically
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-07-13 18:18:33 -07:00
Vincent Batts
5ca3e7c54c
Merge pull request #14021 from rhvgoyal/detect-pool-loopback-devices
...
devicemapper: Check loop devices of existing pool
2015-07-13 21:15:23 -04:00
David Lawrence
c35eed7b36
Merge pull request #50 from dmcgowan/fix-token-type
...
Fix access controller resource type
2015-07-13 17:46:36 -07:00
Dave Henderson
f2284b2bd5
Just informing the user that re-eval may be necessary, instead of going to the trouble of trying to detect IP changes
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-07-13 20:36:05 -04:00
Dave Henderson
07f2972dda
Warning user that the active machine was restarted and may have a new IP
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-07-13 20:34:19 -04:00
Nathan LeClaire
4d0fdaadd4
Merge pull request #1519 from ehazlett/docs-remove-install-links
...
remove direct install links
2015-07-13 17:33:54 -07:00
Nathan LeClaire
cd55ca0030
Merge pull request #1506 from ericsage/1502
...
Return better error for issue #1502 .
2015-07-13 17:33:30 -07:00
Jeffrey Morgan
ce6cecc080
Merge branch 'master' of github.com:docker/toolbox
2015-07-13 17:29:46 -07:00
Jeffrey Morgan
0bec920046
set -e on windows
2015-07-13 17:29:35 -07:00
Eric Sage
6410da8f34
Switch to errors.New
...
Signed-off-by: Eric Sage <eric.david.sage@gmail.com >
2015-07-13 20:09:59 -04:00
Jessie Frazelle
35b0223921
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
2015-07-13 17:08:05 -07:00
Jessie Frazelle
e221291a25
Merge pull request #14194 from phemmer/cli-version-format
...
add --format flag to `docker version`
2015-07-13 17:04:06 -07:00
Michael Chiang
efd6e4dfa8
Adding Kitematic to the install info.
...
- Adding KM
2015-07-13 16:53:52 -07:00
Jeffrey Morgan
65d6b97b82
Stop on error on Mac OS X
2015-07-13 16:25:10 -07:00