Merge PR masterzen#14 from upstream masterzen/winrm repo.

mefellows · Nov 25, 2014 · 3b63a90 · 3b63a90
2 parents b7546c3 + 90c1c74
commit 3b63a90
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/development/.vagrant/machines/default/virtualbox/action_provision b/development/.vagrant/machines/default/virtualbox/action_provision
@@ -0,0 +1 @@
+1.5:a2b676fb-2385-4257-9bda-53f19c65d3b5
diff --git a/development/.vagrant/machines/default/virtualbox/action_set_name b/development/.vagrant/machines/default/virtualbox/action_set_name
@@ -0,0 +1 @@
+1416488453
diff --git a/development/.vagrant/machines/default/virtualbox/id b/development/.vagrant/machines/default/virtualbox/id
@@ -0,0 +1 @@
+a2b676fb-2385-4257-9bda-53f19c65d3b5
diff --git a/development/.vagrant/machines/default/virtualbox/index_uuid b/development/.vagrant/machines/default/virtualbox/index_uuid
@@ -0,0 +1 @@
+201235a9e6b640f0b3d8d04483a62e86
diff --git a/development/.vagrant/machines/default/virtualbox/synced_folders b/development/.vagrant/machines/default/virtualbox/synced_folders
@@ -0,0 +1 @@
+{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/mfellows/go/src/github.com/mefellows/winrm/development","disabled":false}}}
diff --git a/winrm.go b/winrm.go
@@ -19,7 +19,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/masterzen/winrm/winrm"
+	"github.com/mefellows/winrm/winrm"
 	"os"
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/mfellows/go/src/github.com/mefellows/winrm/development","disabled":false}}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ package main @@
     import (
     	"flag"
     	"fmt"
-    	"github.com/masterzen/winrm/winrm"
+    	"github.com/mefellows/winrm/winrm"
     	"os"
     )
@@ Expand Down @@