diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-04 08:43:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-04 08:43:08 +0000 |
| commit | e031fffd0b2d23aa360fe15099e51df6a557dc98 (patch) | |
| tree | 1d2b0b272c0be6ec544054776ca7952314be53cb | |
| parent | 156ca4ae41885347ebb101b763d1d49a6ad8b8f0 (diff) | |
| parent | b31b82e5d988041aba7e6cf36ee463b7af541e73 (diff) | |
Merge "ONAP normative fixes" into release-1.1.0
| -rw-r--r-- | sdc-os-chef/pom.xml | 4 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index 84e9274acf..163655691e 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -71,9 +71,7 @@ ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb </path> <lines> - <line>normal['version'] = - "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - </line> + <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line> </lines> </file> </files> diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb deleted file mode 100644 index dac5853353..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb +++ /dev/null @@ -1,2 +0,0 @@ -normal['version'] = - "1.1.0" |