Merge "Table schema fixes"

Former-commit-id: 3ba9a345c366f865fa70dd89dfbb5325009b5cce

diff --git a/dgbuilder/.gitignore b/dgbuilder/.gitignore
index 39c2405..e0a11b5 100644 (file)
--- a/dgbuilder/.gitignore
+++ b/dgbuilder/.gitignore
@@ -10,4 +10,5 @@ target/
 MANIFEST.MF\r
 .DS_STORE\r
 .metadata\r
-pom.xml_base
\ No newline at end of file
+pom.xml_base\r
+node_modules
\ No newline at end of file

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index e5e7801..593c5ae 100644 (file)
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -88,7 +88,7 @@
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/Playbooks</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/yml</directory>

diff --git a/installation/dgbuilder/.gitignore b/installation/dgbuilder/.gitignore
new file mode 100755 (executable)
index 0000000..ed7fb70
--- /dev/null
+++ b/installation/dgbuilder/.gitignore
@@ -0,0 +1 @@
+releases
\ No newline at end of file

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 9736911..4fb1839 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -26,6 +26,7 @@
         <module>vnfapi</module>
         <module>lcm</module>
         <module>restapi-templates</module>
+        <module>datachange</module>
         <module>installer</module>
     </modules>