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.

Sign up for GitHub

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

Jump to bottom

Merge latest code changes from docker/machine #5

Merged
merged 24 commits into from
Jun 2, 2015
Merged

Merge latest code changes from docker/machine #5

merged 24 commits into from
Jun 2, 2015

Commits on May 28, 2015

  1. redhat: use engine version 1.7rc1 

    Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
    @ehazlett
    ehazlett committed May 28, 2015
    Configuration menu
    Copy the full SHA
    584dec8 View commit details
    Browse the repository at this point in the history

  2. exoscale: update egoscale binding for 32-bit compatibility 

    egoscale is updated to use int64 where it makes sense.

Closes #1212.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
    @vincentbernat
    vincentbernat committed May 28, 2015
    Configuration menu
    Copy the full SHA
    9fb227b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1258 from exoscale/fix/egoscale-32bit 

    exoscale: update egoscale binding for 32-bit compatibility
    @ehazlett
    ehazlett committed May 28, 2015
    Configuration menu
    Copy the full SHA
    139eb28 View commit details
    Browse the repository at this point in the history

  4. exoscale/doc: remove ability to choose a keypair 

    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>
    @vincentbernat
    vincentbernat committed May 28, 2015
    Configuration menu
    Copy the full SHA
    b414f00 View commit details
    Browse the repository at this point in the history

  5. exoscale/doc: specifying URL endpoint is not mandatory 

    Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
    @vincentbernat
    vincentbernat committed May 28, 2015
    Configuration menu
    Copy the full SHA
    704e5fc View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1259 from exoscale/fix/exoscale-doc 

    exoscale: Two small documentation fixes
    @ehazlett
    ehazlett committed May 28, 2015
    Configuration menu
    Copy the full SHA
    67bc2d6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1257 from ehazlett/redhat-latest-rpm 

    redhat: use engine version 1.7rc1
    @ehazlett
    ehazlett committed May 28, 2015
    Configuration menu
    Copy the full SHA
    cef1686 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2015

  1. libmachine: wait for instance start before polling SSH 

    Signed-off-by: Jan Broer <janeczku@yahoo.de>
    Jan Broer committed May 29, 2015
    Configuration menu
    Copy the full SHA
    c7e9dc7 View commit details
    Browse the repository at this point in the history

  2. Fix typo in OpenStack driver documentation 

    Add missing dashes before options

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
    @ggiamarchi
    ggiamarchi committed May 29, 2015
    Configuration menu
    Copy the full SHA
    f251fe9 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2015

  1. Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot … 

    …requests

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
    @hairyhenderson
    hairyhenderson committed May 31, 2015
    Configuration menu
    Copy the full SHA
    904acb9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1276 from hairyhenderson/amazonec2-spot-instance-… 

    …monitoring-fix

Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
    @ehazlett
    ehazlett committed May 31, 2015
    Configuration menu
    Copy the full SHA
    eb5729d View commit details
    Browse the repository at this point in the history

  3. Handle possible error in WaitForSpecific func 

    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>
    @ggiamarchi
    ggiamarchi committed May 31, 2015
    Configuration menu
    Copy the full SHA
    2b9dd68 View commit details
    Browse the repository at this point in the history

  4. Stop polling the instance when status is ERROR 

    Fix #1269

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
    @ggiamarchi
    ggiamarchi committed May 31, 2015
    Configuration menu
    Copy the full SHA
    de817cf View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2015

  1. Merge pull request #1277 from ggiamarchi/openstack/bug#1269 

    Openstack / Stop polling the instance when status is ERROR
    @ehazlett
    ehazlett committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    3cd44ec View commit details
    Browse the repository at this point in the history

  2. fix issue with native ssh; fix tty allocation for redhat 

    Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
    @ehazlett
    ehazlett committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    0b5a389 View commit details
    Browse the repository at this point in the history

  3. support specifying swarm image and docker versions 

    Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
    @ehazlett
    ehazlett committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    cf0aee9 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2015

  1. Merge pull request #1282 from ehazlett/engine-swarm-provision-env-vars 

    enable overrides for engine and swarm install
    @ehazlett
    ehazlett committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    e0aca82 View commit details
    Browse the repository at this point in the history

  2. exoscale: add the appropriate port to make Swarm work 

    Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
    @vincentbernat
    vincentbernat committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    a6c5853 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1286 from exoscale/fix/exoscale-swarm-firewall 

    exoscale: add the appropriate port to make Swarm work
    @ehazlett
    ehazlett committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    5e958d0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1270 from ggiamarchi/doc-openstack-typo 

    Fix typo in OpenStack driver documentation
    @ehazlett
    ehazlett committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    89fdcbc View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1268 from janeczku/waitforssh 

    Check that instance has started before polling SSH
    @ehazlett
    ehazlett committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    a879b39 View commit details
    Browse the repository at this point in the history

  6. Refactor integration tests 

    Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
    @nathanleclaire
    nathanleclaire committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    ed01843 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1158 from nathanleclaire/integration_cleanup 

    Refactor integration tests
    @ehazlett
    ehazlett committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    c268b26 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1280 from ehazlett/native-ssh-fix 

    fix issue with native ssh; fix tty allocation for redhat
    @ehazlett
    ehazlett committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    4a54559 View commit details
    Browse the repository at this point in the history