aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2020-01-22 14:49:32 +0000
committerandre.schmid <andre.schmid@est.tech>2020-01-22 14:51:52 +0000
commit8f967e47b95c78c129c81abd09d0934678451f3d (patch)
treea87ff9a4c8d0a69b6290b8b82c599c395596286d
parent16a9fce0e104a38371a9e5a567ec611ae3fc7f33 (diff)
Fix version.rb after Catalog alignment
Change-Id: Ibd4401a13d39ecbb6e7ba079e7e66d59c70c9e4b Issue-ID: SDC-2724, SDC-2729 Signed-off-by: Ofir Sonsino <os0695@intl.att.com> Signed-off-by: andre.schmid <andre.schmid@est.tech>
-rw-r--r--asdctool/.gitignore1
-rw-r--r--asdctool/pom.xml4
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/version.rb2
3 files changed, 3 insertions, 4 deletions
diff --git a/asdctool/.gitignore b/asdctool/.gitignore
index 4a95481e61..dd8342c4fe 100644
--- a/asdctool/.gitignore
+++ b/asdctool/.gitignore
@@ -1,2 +1,3 @@
/bin/
/build/
+/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/version.rb
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 8c388252d2..3b5e5c83ae 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -581,8 +581,8 @@
${project.basedir}\sdc-cassandra-init\chef-repo\cookbooks\cassandra-actions\attributes\version.rb
</path>
<lines>
- <line>normal['version']
- ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
+ <line>
+ normal['version']="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</line>
</lines>
</file>
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/version.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/version.rb
deleted file mode 100644
index 919b626fa5..0000000000
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/version.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-normal['version']
- ="1.6.0"