minfra-cli 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce377c35c375bead26c389cb71f133d00c34943e2501b31f2857faa79fb6db80
-  data.tar.gz: 79f36a7b3687605752d7993cb74f2cc03a959ff50d49e55363c419333533c846
+  metadata.gz: 85c13c7902b1b38e6fa594e7a63f93ad7648f40738e2cc06a1ae1413d898dca1
+  data.tar.gz: 52ac2f1dc8914969b6ddede468dbd3ab02e5597f652862741e9dd011d517c0b8
 SHA512:
-  metadata.gz: 95da7b04165f9447658c333185d97e7d200d9b19baf00477f8c10012df1b6248099437b57cd0507dbc860cc7912a93ba65ccdd1bd9800207077d382345b47ea9
-  data.tar.gz: 3a69224f2098e83977dbbd111a124e0f1238b055e3326627456f3b17cfdcd3297f0ec535cd029936d2d05efe4e5e5a9285b68907529690b9af3dd17aaa31ff5e
+  metadata.gz: ae8cd064ce5d77085284517ce131e67f7153c3f2a42321bedf7f25a599beae30a515b69aca117de5f741127d493628d648bb5a1dc110578795524fb9363dedcf
+  data.tar.gz: '036991cef9ff075acd446ac45fb8d0709ff8048662c3943b31efa98ccd21ce66e3e0c5faebb51f0ebeb7669f2e5ad266d84c71f8de9394fa0a3eca81e64b062c'

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# 1.2.1
+ * fixing merge
 # 1.2.0
  * no .tags any more
 # 1.1.0

data/lib/minfra/cli/commands/stack/kube_stack_template.rb

@@ -38,11 +38,7 @@ module Minfra
       end
 
       def stack_rb_path
-<<<<<<< HEAD
-        release_path.join('stack.rb')
-=======
         config_path.join('stack.rb')
->>>>>>> 105dc30122db54328cdf1707f5d3d10d4d8792c3
       end
 
       def compose_path(blank: false)

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Peter Schrammel