From: Gitelman, Tal (tg851x) Date: Sun, 11 Mar 2018 14:14:33 +0000 (+0200) Subject: Sync Integ to Master X-Git-Tag: v1.2.0~279 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d9bb1bce581a7a777df2fabd5a8f47598ab08d14;p=sdc.git Sync Integ to Master Change-Id: Ie14051080c986ea781f97920b77b330791ee55f6 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- diff --git a/.gitignore b/.gitignore index 6d7e0bb4e4..c930c4d1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -186,7 +186,6 @@ catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml -catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default/normatives.tar.gz sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC-*.zip @@ -258,9 +257,4 @@ utils/DmaapPublisher/logs/* sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* - -/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default/normatives.tar.gz - -/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default/normatives.tar.gz - -/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default/normatives.tar.gz +*normatives.tar.gz