minfra-cli 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ce377c35c375bead26c389cb71f133d00c34943e2501b31f2857faa79fb6db80
4
- data.tar.gz: 79f36a7b3687605752d7993cb74f2cc03a959ff50d49e55363c419333533c846
3
+ metadata.gz: 85c13c7902b1b38e6fa594e7a63f93ad7648f40738e2cc06a1ae1413d898dca1
4
+ data.tar.gz: 52ac2f1dc8914969b6ddede468dbd3ab02e5597f652862741e9dd011d517c0b8
5
5
  SHA512:
6
- metadata.gz: 95da7b04165f9447658c333185d97e7d200d9b19baf00477f8c10012df1b6248099437b57cd0507dbc860cc7912a93ba65ccdd1bd9800207077d382345b47ea9
7
- data.tar.gz: 3a69224f2098e83977dbbd111a124e0f1238b055e3326627456f3b17cfdcd3297f0ec535cd029936d2d05efe4e5e5a9285b68907529690b9af3dd17aaa31ff5e
6
+ metadata.gz: ae8cd064ce5d77085284517ce131e67f7153c3f2a42321bedf7f25a599beae30a515b69aca117de5f741127d493628d648bb5a1dc110578795524fb9363dedcf
7
+ data.tar.gz: '036991cef9ff075acd446ac45fb8d0709ff8048662c3943b31efa98ccd21ce66e3e0c5faebb51f0ebeb7669f2e5ad266d84c71f8de9394fa0a3eca81e64b062c'
data/CHANGELOG.md CHANGED
@@ -1,3 +1,5 @@
1
+ # 1.2.1
2
+ * fixing merge
1
3
  # 1.2.0
2
4
  * no .tags any more
3
5
  # 1.1.0
@@ -38,11 +38,7 @@ module Minfra
38
38
  end
39
39
 
40
40
  def stack_rb_path
41
- <<<<<<< HEAD
42
- release_path.join('stack.rb')
43
- =======
44
41
  config_path.join('stack.rb')
45
- >>>>>>> 105dc30122db54328cdf1707f5d3d10d4d8792c3
46
42
  end
47
43
 
48
44
  def compose_path(blank: false)
@@ -1,5 +1,5 @@
1
1
  module Minfra
2
2
  module Cli
3
- VERSION = '1.2.0'.freeze
3
+ VERSION = '1.2.1'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: minfra-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Schrammel