Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest code changes from docker/machine #5

Merged
merged 24 commits into from
Jun 2, 2015

Conversation

denverdino
Copy link
Owner

No description provided.

ehazlett and others added 24 commits May 28, 2015 08:51
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
egoscale is updated to use int64 where it makes sense.

Closes #1212.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
exoscale: update egoscale binding for 32-bit compatibility
Due to commit b772e66, it is not
possible to use a custom keypair. Remove mention of it from the
documentation.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
exoscale: Two small documentation fixes
redhat: use engine version 1.7rc1
Signed-off-by: Jan Broer <janeczku@yahoo.de>
Add missing dashes before options

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
…requests

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
…monitoring-fix

Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
In some situations we need to be aware of errors
to basically return it rather than polling again
and angain until the timeout.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
Fix #1269

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
Openstack / Stop polling the instance when status is ERROR
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
enable overrides for engine and swarm install
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
exoscale: add the appropriate port to make Swarm work
Fix typo in OpenStack driver documentation
Check that instance has started before polling SSH
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
fix issue with native ssh; fix tty allocation for redhat
denverdino added a commit that referenced this pull request Jun 2, 2015
Merge latest code changes from docker/machine
@denverdino denverdino merged commit f25cfd5 into denverdino:master Jun 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants