From 8f967e47b95c78c129c81abd09d0934678451f3d Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Wed, 22 Jan 2020 14:49:32 +0000 Subject: Fix version.rb after Catalog alignment Change-Id: Ibd4401a13d39ecbb6e7ba079e7e66d59c70c9e4b Issue-ID: SDC-2724, SDC-2729 Signed-off-by: Ofir Sonsino Signed-off-by: andre.schmid --- asdctool/.gitignore | 1 + asdctool/pom.xml | 4 ++-- .../chef-repo/cookbooks/cassandra-actions/attributes/version.rb | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/version.rb 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 - normal['version'] - ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + normal['version']="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" 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" -- cgit 1.2.3-korg