elecksee 1.0.12 → 1.0.14

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.14
+* Remove rebase artifact because duh
+
 ## v1.0.12
 * Allow access to ephemeral setup without creation
 * Add `#destroy` method to `Lxc` instances

data/lib/elecksee/lxc.rb

@@ -362,7 +362,6 @@ class Lxc
     end
   end
 
->>>>>>> [ephemeral] lxc.destroy()
   def wait_for_state(desired_state, args={})
     args[:sleep_interval] ||= 1.0
     wait_total = 0.0

data/lib/elecksee/version.rb

@@ -2,5 +2,5 @@ module Elecksee
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.12')
+  VERSION = Version.new('1.0.14')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.14
   prerelease:
 platform: ruby
 authors:
@@ -60,6 +60,7 @@ files:
 - elecksee-1.0.10.gem
 - LICENSE
 - CHANGELOG.md
+- elecksee-1.0.12.gem
 - Gemfile.lock
 - lib/elecksee.rb
 - lib/elecksee/clone.rb