Nathan LeClaire
|
432eece6ff
|
Merge pull request #2904 from patrikerdes/2903_swarm_replication
Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
|
2016-01-22 14:52:26 -08:00 |
|
Nathan LeClaire
|
72d9c4d039
|
Merge pull request #2889 from dgageot/wait-host-only
Always wait for the host-only adapter to appear
|
2016-01-22 12:17:06 -08:00 |
|
Patrik Erdes
|
92b9853478
|
Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
Signed-off-by: Patrik Erdes <patrik@erdes.se>
|
2016-01-22 14:51:59 +01:00 |
|
Jean-Laurent de Morlhon
|
c341a289e1
|
Merge pull request #2900 from zchee/fix-typo-vb-misc
Fix typo
|
2016-01-22 09:32:55 +01:00 |
|
Koichi Shiraishi
|
9ea9399fa8
|
Fix typo
Signed-off-by: Koichi Shiraishi <k@zchee.io>
|
2016-01-22 14:13:24 +09:00 |
|
David Gageot
|
6ed2ab0e79
|
Always wait for the host-only adapter to appear
Signed-off-by: David Gageot <david@gageot.net>
|
2016-01-21 07:55:28 +01:00 |
|
Nathan LeClaire
|
474363d27a
|
Merge pull request #2821 from hypriot/check-grand-parent-for-windows-shell
Detect shell from grand parent process name if not directly called from a windows shell
|
2016-01-20 15:55:23 -08:00 |
|
Nathan LeClaire
|
1449d69cde
|
Merge pull request #2885 from exoscale/fix/doc-exoscale
docs: fix --exoscale-image description in documentation
|
2016-01-20 15:53:55 -08:00 |
|
Vincent Bernat
|
99870c2b5d
|
docs: fix --exoscale-image description in documentation
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
|
2016-01-20 14:41:34 +01:00 |
|
Jean-Laurent de Morlhon
|
aeec7b716e
|
Merge pull request #2881 from robbertkl/docs-fix-ips
Replace public IPs with reserved ones
|
2016-01-20 10:32:22 +01:00 |
|
Jean-Laurent de Morlhon
|
96a5d31e83
|
Merge pull request #2880 from robbertkl/docs-fix-default
Add other commands that support default machine
|
2016-01-20 10:30:55 +01:00 |
|
Robbert Klarenbeek
|
cda5d00bd8
|
Replace public IPs with reserved ones
Signed-off-by: Robbert Klarenbeek <robbertkl@renbeek.nl>
|
2016-01-20 03:31:14 +01:00 |
|
Robbert Klarenbeek
|
106ce360a5
|
Add other commands that support default machine
Signed-off-by: Robbert Klarenbeek <robbertkl@renbeek.nl>
|
2016-01-20 03:13:03 +01:00 |
|
Stefan Scherer
|
3b4b168051
|
Check grand parent if not directly called from a windows shell
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
|
2016-01-20 01:16:00 +01:00 |
|
Jean-Laurent de Morlhon
|
62bcc30859
|
Merge pull request #2874 from jeanlaurent/rm-infinite-loop
Fix infinite loop when deleting machine in ultra weird state
|
2016-01-19 16:55:55 +01:00 |
|
Jean-Laurent de Morlhon
|
e466ee9479
|
Fix infinite loop when deleting machine in ultra weird state
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
|
2016-01-19 16:29:29 +01:00 |
|
David Gageot
|
291533a671
|
Merge pull request #2872 from jeanlaurent/itbugsnag
Fix #2863 - write IT test for bugsnag
|
2016-01-19 16:16:35 +01:00 |
|
Jean-Laurent de Morlhon
|
872241e1ae
|
Fix #2863 - write IT test for bugsnag
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
|
2016-01-19 15:20:27 +01:00 |
|
Jean-Laurent de Morlhon
|
b812fc9e2a
|
Merge pull request #2869 from dgageot/fix-typo
vbm.go typo
|
2016-01-19 10:33:35 +01:00 |
|
Henrik Nyh
|
3b90a2a0a2
|
vbm.go typo
Signed-off-by: David Gageot <david@gageot.net>
|
2016-01-19 08:52:28 +01:00 |
|
David Gageot
|
81a13c4af9
|
Merge pull request #2864 from nathanleclaire/deprecate_minus_d
Update CoreOS provisioner to use 'docker daemon'
|
2016-01-19 08:51:16 +01:00 |
|
David Gageot
|
4bd97a106a
|
Merge pull request #2865 from nathanleclaire/inspect_test
Add test for 'docker-machine inspect'
|
2016-01-19 08:50:26 +01:00 |
|
David Gageot
|
9603e2c2a3
|
Merge pull request #2868 from nathanleclaire/bump_dev_version_0.6.0-rc2
Bump version to 0.6.0-rc2-dev
|
2016-01-19 08:49:52 +01:00 |
|
David Gageot
|
3ba53a0869
|
Merge pull request #2867 from nathanleclaire/bump_changelog_0.6.0-rc1
Bump changelog for 0.6.0-rc1
|
2016-01-19 08:48:25 +01:00 |
|
Nathan LeClaire
|
a494033da9
|
Bump version to 0.6.0-rc2-dev
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
|
2016-01-18 16:02:20 -08:00 |
|
Nathan LeClaire
|
85cb395c3d
|
Bump changelog for 0.6.0-rc1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
|
2016-01-18 15:58:08 -08:00 |
|
Nathan LeClaire
|
174e390d5b
|
Merge pull request #2866 from nathanleclaire/bump-0.6.0-rc1
Bump version to 0.6.0-rc1
|
2016-01-18 15:09:11 -08:00 |
|
Nathan LeClaire
|
a845e1a45c
|
Bump version to 0.6.0-rc1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
|
2016-01-18 14:35:30 -08:00 |
|
Nathan LeClaire
|
8ea5300b5a
|
Add test for 'docker-machine inspect'
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
|
2016-01-18 14:30:11 -08:00 |
|
Nathan LeClaire
|
ac0adbe7f8
|
Update CoreOS provisioner to use 'docker daemon'
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
|
2016-01-18 14:28:42 -08:00 |
|
David Gageot
|
d6e7d5b966
|
Merge pull request #2846 from jeanlaurent/aws-doc-update
Update AWS doc
|
2016-01-18 12:53:40 +01:00 |
|
Jean-Laurent de Morlhon
|
a0852829c6
|
Update AWS doc
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
|
2016-01-18 12:40:50 +01:00 |
|
Jean-Laurent de Morlhon
|
f289123574
|
Merge pull request #2856 from dgageot/fix-bugsnag
Fix bugsnag
|
2016-01-18 12:36:46 +01:00 |
|
David Gageot
|
b5e6e20a8f
|
Disable bugsnag report for upgrades for now
Signed-off-by: David Gageot <david@gageot.net>
|
2016-01-18 11:56:20 +01:00 |
|
David Gageot
|
d518e171b9
|
Fix bugsnag reports for create
Signed-off-by: David Gageot <david@gageot.net>
|
2016-01-18 11:42:21 +01:00 |
|
Jean-Laurent de Morlhon
|
38b6ae3ce4
|
Merge pull request #2855 from dgageot/fix-the-build
Fix the build
|
2016-01-18 11:15:03 +01:00 |
|
David Gageot
|
19ec3e6d50
|
Fix the build
Signed-off-by: David Gageot <david@gageot.net>
|
2016-01-18 11:06:03 +01:00 |
|
Jean-Laurent de Morlhon
|
b71873ad2d
|
Merge pull request #2849 from frapposelli/fix-mount-fusion
Fix shared folder mount on restart
|
2016-01-18 09:55:22 +01:00 |
|
David Gageot
|
501b8666ce
|
Merge pull request #2121 from nathanleclaire/provision_cmd
Add docker-machine provision command
|
2016-01-18 08:53:15 +01:00 |
|
David Gageot
|
51c49091c3
|
Merge pull request #2843 from nathanleclaire/short_form_cmds
Add ability to imply 'default' VM in commands
|
2016-01-18 08:49:31 +01:00 |
|
Jean-Laurent de Morlhon
|
947adf539c
|
Merge pull request #2850 from zchee/fix-provision-redhat
Fix docker daemon flag on redhat
|
2016-01-16 08:38:02 +01:00 |
|
Koichi Shiraishi
|
21e4472920
|
Fix docker daemon flag on redhat
- Same as https://github.com/docker/machine/pull/2844
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
|
2016-01-16 12:54:06 +09:00 |
|
Nathan LeClaire
|
5000139c8e
|
Add ability to imply 'default' VM in commands
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
|
2016-01-15 17:10:08 -08:00 |
|
Fabio Rapposelli
|
00040796e2
|
Fix shared folder mount on restart
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
|
2016-01-15 22:29:43 +01:00 |
|
Nathan LeClaire
|
0bbf6f126d
|
Merge pull request #2789 from robvanmieghem/master
FIX #2411 On a btrfs system, don't default to aufs
|
2016-01-15 13:20:26 -08:00 |
|
Jean-Laurent de Morlhon
|
9ed16a0e4e
|
Merge pull request #2847 from jeffellin/UseExistingKeypair
Fixes #1898. Add parameter to pass private key path to use when creat…
|
2016-01-15 21:49:18 +01:00 |
|
Rob Van Mieghem
|
84ff3e3549
|
Improve provisiontest.FakeSSHCommander
Signed-off-by: Rob Van Mieghem <rob@vanmieghemcloud.com>
|
2016-01-15 21:13:29 +01:00 |
|
Jeffrey Ellin
|
c3131ec3fa
|
Fixes #1898. Add parameter to pass private key path to use when creating a machine.
It is assumed that the corresponding public certificate will be the same file name + .pub
Signed-off-by: Jeffrey Ellin <jeff@ellin.com>
|
2016-01-15 15:10:03 -05:00 |
|
David Gageot
|
53c5b1f481
|
Merge pull request #2845 from jeanlaurent/aws-unit-test-are-unit-again
Fix 2829 : aws unit test are unit again
|
2016-01-15 16:47:29 +01:00 |
|
David Gageot
|
dd5dd5d178
|
Merge pull request #2790 from daehyeok/vmwarefusion_dhcp
VMWARE Fusion get IP from multiple leases files
|
2016-01-15 16:46:54 +01:00 |
|