Evan Hazlett
aae1cb35e7
Merge pull request #748 from ahmetalpbalkan/azure/syntax
...
drivers/azure: idiomatic syntax fixes
2015-03-10 16:20:48 -04:00
Evan Hazlett
7404e4d3ff
Merge pull request #736 from shawnzhu/tlsverify-flag
...
uses --tlsverify instead of --tls in config output
2015-03-09 22:49:07 -04:00
Evan Hazlett
2fd1fee412
Merge pull request #720 from joninvski/patchDoc
...
Correct index.md documentation preamble
2015-03-09 22:48:29 -04:00
Evan Hazlett
3351f8c58d
Merge pull request #726 from hairyhenderson/openstack-net-id-usage-fix
...
Fixing inaccurate Usage message for the `--openstack-net-id` option
2015-03-09 22:42:24 -04:00
Evan Hazlett
790d0cbf49
Merge pull request #751 from slashk/750-virtualbox-saved-paused-support
...
fixes Issue #750 by allowing virtualbox driver
2015-03-09 22:41:19 -04:00
Evan Hazlett
2f853ee671
Merge pull request #667 from ggiamarchi/openstack-dead-code
...
Openstack driver - Remove dead code
2015-03-09 22:39:09 -04:00
Ken Pepple
bfd83eebbe
fixes Issue #750 by allowing virtualbox driver
...
start command to start VMs in saved state and
resume VMs in paused state.
Signed-off-by: Ken Pepple <ken@solinea.com>
converted to switch statement per @nathanleclaire suggestion
Signed-off-by: Ken Pepple <ken@solinea.com>
small typo
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-10 00:32:39 +01:00
Evan Hazlett
3787758034
Merge pull request #760 from ehazlett/softlayer-provisioning-fix
...
softlayer: fix provisioning bug where curl is not available
2015-03-09 18:52:58 -04:00
Evan Hazlett
96b660d5b7
softlayer: fix provisioning bug where curl is not available
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 18:31:41 -04:00
Evan Hazlett
9d7c6874fe
Merge pull request #754 from ehazlett/integration-test-updates
...
more integration test robustness
2015-03-07 18:24:45 -05:00
Evan Hazlett
ed4fa09311
more integration test robustness
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-07 18:19:15 -05:00
Joao Trindade
6d2e0b0dd1
Correct index.md documentation preamble
...
1. Add "---" to indicate the preamble section.
2. Add drivers in keywords to improve SEO
Signed-off-by: Joao Trindade <trindade.joao@gmail.com>
2015-03-07 09:01:07 +00:00
Ahmet Alp Balkan
e78269c287
drivers/azure: idiomatic syntax fixes
...
This change includes some shorthand syntax refactoring and dead code removal.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-06 23:38:57 -08:00
Ke Zhu
1bb4b95110
keep using --tlsverify between config and env commands
...
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
2015-03-06 22:22:00 -05:00
Evan Hazlett
a26f59ddcd
Merge pull request #740 from ahmetalpbalkan/doc/env-fix
...
doc: fix sample output in DOCKER_TLS_VERIFY
2015-03-06 18:44:13 -05:00
Evan Hazlett
de8f6f00a1
Merge pull request #711 from ehazlett/travis-cleanup
...
remove unneeded cleanup from travis config
2015-03-06 18:37:56 -05:00
Ahmet Alp Balkan
cdca12025f
doc: fix sample output in DOCKER_TLS_VERIFY
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-06 14:19:40 -08:00
Evan Hazlett
3b712a15e8
Merge pull request #738 from ehazlett/tls-verify-set-consistency
...
consistent naming for DOCKER_TLS_VERIFY env var
2015-03-06 16:39:37 -05:00
Evan Hazlett
0748d70b4e
consistent naming for DOCKER_TLS_VERIFY env var
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-06 16:29:17 -05:00
Evan Hazlett
989db1bf96
Merge pull request #690 from nathanleclaire/universal_poll_retries
...
Introduce universal poll retries function
2015-03-06 13:55:33 -05:00
Evan Hazlett
5b81fde44a
Merge pull request #722 from vieux/keep_swarm_default
...
Revert "Use random strategy for Swarms"
2015-03-06 12:52:56 -05:00
Dave Henderson
093914cbd5
Fixing inaccurate Usage message for the `--openstack-net-id` option
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-06 07:04:06 -05:00
Evan Hazlett
2045708e70
Merge pull request #694 from ehazlett/driver-spec
...
Proposal: driver spec v1
2015-03-06 04:47:40 -06:00
Victor Vieux
b3394fbedf
Revert "Use random strategy for Swarms"
...
This reverts commit aa3940deb7
.
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 15:11:09 -08:00
Evan Hazlett
2121382d08
Merge pull request #718 from cheng--zhang/wording
...
Modify description of StartDocker and StopDocker
2015-03-05 06:47:05 -08:00
Cheng Zhang
b756be37eb
Modify description of StartDocker and StopDocker
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2015-03-05 16:09:19 +08:00
Nathan LeClaire
1e983d5ff6
Introduce universal poll retries function
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-04 16:41:48 -08:00
Evan Hazlett
aa3f54c033
Merge pull request #714 from knarz/add_digitalocean_flags_docs
...
add the three new DO flags to the docs
2015-03-04 14:45:26 -08:00
Sascha Hanse
b159381f74
add the three new DO flags to the docs
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-03-04 22:22:25 +01:00
Evan Hazlett
71533dd10f
Merge pull request #713 from ehazlett/revert-709
...
Revert "Fix check for whether docker is installed"
2015-03-04 13:18:13 -08:00
Evan Hazlett
8b6ccddd80
Revert "Fix check for whether docker is installed" we need to revisit
...
This reverts commit ddc0c50b91
.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-04 13:17:00 -08:00
Evan Hazlett
0dcd688799
remove unneeded cleanup from travis config
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-04 13:07:15 -08:00
Evan Hazlett
66664f8b25
Merge pull request #695 from knarz/add_digitalocean_flags
...
add flags for ipv6, backups and private networking to the DigitalOcean driver
2015-03-04 13:06:25 -08:00
Evan Hazlett
839cc67ab6
Merge pull request #709 from nathanleclaire/fix_docker_check
...
Fix check for whether docker is installed
2015-03-04 11:37:53 -08:00
Nathan LeClaire
ddc0c50b91
Fix check for whether docker is installed
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-04 11:34:48 -08:00
Evan Hazlett
6da2128e23
Merge pull request #700 from nathanleclaire/ec2_fixes
...
EC2 fixes
2015-03-03 17:12:02 -08:00
Nathan LeClaire
8d0bf21c6d
Fix panic when instance doesn't exist remotely
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 14:48:04 -08:00
Nathan LeClaire
a7d1a70442
Fix IP address not being set correctly due to race
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 14:47:06 -08:00
Evan Hazlett
9404aa2f88
move driver spec to docs
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-03 11:51:56 -08:00
Evan Hazlett
2c8823fab7
Merge pull request #697 from nathanleclaire/ec2_clean
...
Clean up unused function
2015-03-03 11:50:19 -08:00
Nathan LeClaire
3a030c9ccb
Clean up unused function
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-03 11:18:08 -08:00
Evan Hazlett
e433f7100f
Merge pull request #684 from jonathanmorley/fish-semicolons
...
Add semicolons to fish output for docker-machine env command
2015-03-03 11:15:53 -08:00
Evan Hazlett
d00e67b3f7
elaborate on testing for the driver spec
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-03 07:15:07 -05:00
Evan Hazlett
2cf681d792
initial driver spec draft
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-03 07:01:18 -05:00
Jonathan Morley
0462a3b2fc
Add semicolons to fish output for docker-machine env command
...
This allows fish users to use `eval (docker-machine env ...)`
Signed-off-by: Morley, Jonathan <morley.jonathan@gmail.com>
2015-03-03 06:41:08 -05:00
Sascha Hanse
5bc443194c
Merge branch 'add_digitalocean_flags' of https://github.com/knarz/machine into add_digitalocean_flags
2015-03-03 12:24:20 +01:00
Sascha Hanse
17b928fac0
add flags for ipv6, backups and private networking to the DigitalOcean driver
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-03-03 12:22:11 +01:00
Evan Hazlett
7bf67e41c9
Merge pull request #615 from ehazlett/integration-testing
...
switch to bats for integration testing
2015-03-02 17:24:47 -05:00
Evan Hazlett
f3bd689485
Merge pull request #689 from ehazlett/ec2-fix-iam-tests
...
ec2: fix iam test
2015-03-02 17:23:45 -05:00
Evan Hazlett
2ea5a976d8
ec2: fix iam test
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-02 17:20:47 -05:00