kitchen-hyperv 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ebbd881261a4c181dd20609af6dbe637e31a9f
-  data.tar.gz: f72840dd9fe7aa7656f587a308f2083ad367f3be
+  metadata.gz: 017038c10e27141bf71e6599cd7643cb8c19a644
+  data.tar.gz: e2348ae902d0fe74e6b85b396a8699c10ef07d69
 SHA512:
-  metadata.gz: 3570223eaed7e14b5de2d3882e5c92db9ed7794253c5fcece900cd5285cd4a623188fe493342201431961a6e8742406f59c92015a61843ae35bb257ab0095e86
-  data.tar.gz: 96186575c571efaae757e730d5eb6c674cdd6414264bdd386a97d66a1a0220dca8a361541976028d96e7e791cae85f2649232b25e73c4f5d767998a76d384d57
+  metadata.gz: 731adc92811964e1b8cf1e9ed10d3a6976e7b317ff11edcceb84796de86dc070f7dfc05df00bff8efa7eaca0c9488b6b3324b719859c61dfb4620125a2ab94dc
+  data.tar.gz: 37723623737f24a492dee1646c2ea75b0b53d9460acae168d9fa56ff8ba8feaa9abb5debe57ac865fecc923091c424004e6a4cfb9aa2a5280602b4caea5e5859

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.9 / 12-03-2015
+
+Missed a merge conflict.
+
 # 0.1.8 / 12-03-2015
 
 * [PR #15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) : Dynamic Memory support

data/lib/kitchen/driver/hyperv_version.rb

@@ -17,6 +17,6 @@
 
 module Kitchen
   module Driver
-      HYPERV_VERSION = '0.1.8'
+      HYPERV_VERSION = '0.1.9'
   end
 end

data/support/hyperv.ps1

@@ -194,10 +194,5 @@ function Mount-VMISO
     [cmdletbinding()]
     param($Id, $Path)
 
-<<<<<<< HEAD
     set-VMDvdDrive -VMName (Get-VM -Id $Id).Name -Path $Path
-=======
-    set-VMDvdDrive -VMName (get-vm -id $Id).Name -Path $Path
-
->>>>>>> brantb/dynamic-memory
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Steven Murawski