Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Add --rackspace-active-timeout argument to rackspace driver #3215

Merged
merged 1 commit into from
Mar 22, 2016

Conversation

sivel
Copy link
Contributor

@sivel sivel commented Mar 21, 2016

This PR adds a new argument --rackspace-active-timeout to the rackspace driver to match that of the openstack driver.

Additionally, I have updated the description for rackspace-image-id to reflect the correct Ubuntu 15.10 default image. The image ID that is the default is documented and validated as being 15.10, the description however mentioned that it was 14.04.

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "rackspace-active-timeout" git@github.com:sivel/machine.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Ammending updates the existing PR. You DO NOT need to open a new one.

Signed-off-by: Matt Martz <matt@sivel.net>
@nathanleclaire
Copy link
Contributor

cc @ggiamarchi what do you think?

@nathanleclaire
Copy link
Contributor

LGTM

nathanleclaire added a commit that referenced this pull request Mar 22, 2016
Add --rackspace-active-timeout argument to rackspace driver
@nathanleclaire nathanleclaire merged commit cec812a into docker:master Mar 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants