Commit Graph

1462 Commits

Author SHA1 Message Date
Xiaohui 102007b231 separate pkgaction into 'pkgaction' and 'serviceaction'
ignored IntellJ IDEA files

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-09-17 11:15:38 +08:00
Nathan LeClaire 993b5f557f Merge pull request #1810 from xiaohui/cleanup
cleanup log.*ln and correct typos error
2015-09-16 16:38:40 -07:00
Nathan LeClaire b91c117238 Merge pull request #1816 from frapposelli/fusion-fuse-mount
Adding FUSE HGFS mount option
2015-09-16 16:07:31 -07:00
Nathan LeClaire f531eed130 Merge pull request #1848 from dmp42/5-hostsyntax
Fix #1846
2015-09-16 11:52:57 -07:00
Nathan LeClaire 7e1e8b6717 Merge pull request #1842 from moxiegirl/carry-1830
Updating with changes dropped in 1830
2015-09-15 17:42:53 -07:00
Mary Anthony f8535f1397 Updating with changes dropped in 1830
Tweaking language
Incorporate Olivier's comments
Stomp the nit --- a misspelling
Wrapping lines
Possessive

Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-15 17:00:57 -07:00
Nathan LeClaire 5e698f3d95 Merge pull request #1631 from dgageot/features/startstop
FIX #676 - Support Start/Stop GCE instance
2015-09-15 11:54:51 -07:00
Nathan LeClaire 207a647a40 Merge pull request #1633 from dgageot/features/tags
FIX #1297 - Support additional tags on GCE
2015-09-15 11:54:39 -07:00
Evan Hazlett 48d257aaf1 Merge pull request #1855 from mattjmcnaughton/1849-fix-formatting-in-fatal
Fix Go Vet errors
2015-09-15 14:20:32 -04:00
David Gageot 66078be1e5 FIX #1297 - Support additional tags on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-09-15 06:56:52 +02:00
David Gageot bb45f83319 FIX #676 - Support Start/Stop GCE instance
Signed-off-by: David Gageot <david@gageot.net>
2015-09-15 06:54:53 +02:00
Matt McNaughton a0b9d179b1 Fix Go Vet errors
This commit makes no changes to code execution, but rather resolves some
`go vet` errors, the majority of which relate to `fatal` being used
instead of `fatalf` during testing.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
2015-09-14 22:37:16 -04:00
Xiaohui dcdd1a4757 cleanup log.*ln, unuseful methods, some typos error …
1. cleanup log.*ln for #1081
2. add "\n" to config command
3. typos error
4. remove unuseful methods: getBasedir@commands.go, and
GetDefaultTestHost@commands_test

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-09-14 15:25:50 +08:00
Olivier Gambier 009ed57719 Fix #1846
Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-13 13:13:58 -07:00
Nathan LeClaire 1a8fb2a071 Merge pull request #1830 from ehazlett/install-link-docs
Clarify Install Location
2015-09-11 14:43:58 -07:00
Nathan LeClaire b52fa33056 Merge pull request #1479 from mschygulla/enhanced-vmwarefusion-driver
[Enhancement] VMware Fusion driver
2015-09-11 14:26:30 -07:00
Nathan LeClaire 7c4d0a5da7 Merge pull request #1642 from ddaze/openstack-retry
openstack: New machine active timeout parameter
2015-09-11 14:25:11 -07:00
Nathan LeClaire 5ba35ac2de Merge pull request #1812 from jclagache/master
1434-Added homebrew cask support for VMware Fusion
2015-09-11 14:21:39 -07:00
Nathan LeClaire 1d5fde2c1a Merge pull request #1834 from dmp42/1-coverage
Enhanced coverage system
2015-09-11 14:19:32 -07:00
Nathan LeClaire 1b0042e69b Merge pull request #1836 from dmp42/2-fmt
Fmt fixes
2015-09-10 19:07:06 -07:00
Olivier Gambier 9d60bb7c73 Fmt fixes
Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-10 18:27:13 -07:00
Olivier Gambier 4c96efa5fc Better coverage script
- added coveralls integration
- more efficient script logic
- simplified usage

Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-10 16:28:19 -07:00
Nathan LeClaire 0fb4991068 Merge pull request #1796 from rikdev/powershell-no-profile
Disabled load PowerShell profile when start the powershell.exe
2015-09-10 15:19:47 -07:00
Nathan LeClaire bd168c4050 Merge pull request #1811 from ehazlett/debug-env-var
change debug env var to MACHINE_DEBUG
2015-09-10 14:32:26 -07:00
Evan Hazlett 5b1b4db2ad
add install links for machine
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-09-09 12:52:40 -04:00
jclagache ebbc45abea 1434-Added homebrew cask support for VMware Fusion
This aims to lookup for Vmware Fusion required binaries (vmrun and vmware-vdiskmanager) in the system path first before falling back in the default Vmware Fusion installing path.
Thereby, the vmwarefusion docker-machine driver can now be used even if Vmware Fusion is not installed in its default location (with brew cask for example).
Signed-off-by: Jean-Christophe Lagache <jclagache@gmail.com>
2015-09-08 13:39:56 +02:00
Fabio Rapposelli c3ed882b76 Adding FUSE HGFS mount option
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-09-07 17:31:21 +02:00
Evan Hazlett 3c712ae30a
change debug env var to MACHINE_DEBUG
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-09-05 08:57:03 -04:00
Ivan Ryabchenko d4ce483ebc Disabled load PowerShell profile when start the interpreter powershell.exe
Signed-off-by: Ivan Ryabchenko <rik.ggm@gmail.com>
2015-09-03 02:29:36 +06:00
Evan Hazlett 08208bd141 Merge pull request #1463 from mschygulla/coreos-provisioner
Provisioner for CoreOS
2015-09-02 14:44:50 -04:00
Evan Hazlett f8b0ca86c2 Merge pull request #1780 from paultag/paultag/cleanup/remove-redundent-redundent-logic
Remove redundent assignment to InsecureSkipVerify
2015-08-31 11:25:34 -04:00
Paul Tagliamonte e75902ffbf Remove redundent assignment to InsecureSkipVerify
This second codepath is redundent, since tlsConfig.InsecureSkipVerify is
assigned to earlier in that function body. In addition, there's no need
to wrap the assignment in a check on that boolean value in this case.

Signed-off-by: Paul Tagliamonte <paultag@gmail.com>
2015-08-30 19:42:33 -04:00
Evan Hazlett b8f7c3446b Merge pull request #1674 from csakoda/fix-VBox-getRandomIPinSubnet
Fix VirtualBox DHCPServer always uses x.x.x.1, despite getRandomIPinSubnet()
2015-08-28 18:29:01 -04:00
Evan Hazlett ff1d6587ea Merge pull request #1750 from hairyhenderson/go15
Updating to Go 1.5
2015-08-28 18:28:26 -04:00
Dave Henderson 3a49c165bd Updating to Go 1.5
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-08-23 15:12:59 -04:00
Evan Hazlett 816d60203a Merge pull request #1743 from skatsuta/ls-mark-inactive
commands: show "-" in ACTIVE column for inactive machines
2015-08-21 10:18:09 -04:00
Nathan LeClaire c02b1c413e Merge pull request #1512 from imikushin/build-on-machine
Add support for building Docker Machine binaries remotely (without bind mount)
2015-08-21 07:52:10 +09:00
Nathan LeClaire 52dc5734a7 Merge pull request #1735 from praveen12bnitt/1733-virtualbox-network-tuning
added support for configuring nictype and nicpromise mode in virtualbox
2015-08-21 07:51:30 +09:00
Palanivelrajan Balasubramanian 3f090d3f47 Added virtio-net as a supported nictype per review comments.
Signed-off-by: Palanivelrajan Balasubramanian <praveen12bnitt@gmail.com>
2015-08-20 16:47:50 -04:00
Evan Hazlett 93366f22be Merge pull request #1741 from frapposelli/GH-1740
[GH-1740] Fix cpu allocation bug
2015-08-20 11:16:11 -04:00
Fabio Rapposelli ffe1a7940b [GH-1740] Fix cpu allocation bug
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-08-20 15:40:06 +02:00
Palanivelrajan Balasubramanian 5f362aca6b added support for configuring nictype and nicpromise mode in virtualbox
Signed-off-by: Palanivelrajan Balasubramanian <praveen12bnitt@gmail.com>
2015-08-19 16:49:42 -04:00
Evan Hazlett e416ac17d8 Merge pull request #1726 from brandoncc/patch-1
Fix typo
2015-08-19 14:52:43 -04:00
Ivan Mikushin 3c1caa5acb Build on any (even remote) docker
Signed-off-by: Ivan Mikushin <i.mikushin@gmail.com>
2015-08-19 13:18:25 +05:00
Brandon Conway b876d5f81f Fix typo 2015-08-18 11:12:59 -07:00
Soshi Katsuta 6496c44261 commands: show "-" in the ACTIVE column for inactive machines
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 01:04:48 +09:00
Nathan LeClaire 9661bf89e1 Merge pull request #1690 from jonmort/disable-ssh-multiplex
Disable ssh multiplex explicitly
2015-08-18 11:38:17 +09:00
Nathan LeClaire 627658242d Merge pull request #1686 from nathanleclaire/makefile
Prioritize using make in build, cleanup a few things in build script
2015-08-18 09:55:38 +09:00
Nathan LeClaire 28831d1f65 Prioritize using make in build
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-08-14 15:41:03 -07:00
Nathan LeClaire b101c29011 Merge pull request #1687 from ehazlett/upgrade-fix-debian
fixes upgrade for debian/ubuntu for new package name
2015-08-13 16:56:49 -07:00