Merge "Update the license for 2017-2018 license"

author James Forsyth <jf2512@att.com>

Thu, 22 Mar 2018 12:16:39 +0000 (12:16 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 22 Mar 2018 12:16:39 +0000 (12:16 +0000)
author James Forsyth <jf2512@att.com>
Thu, 22 Mar 2018 12:16:39 +0000 (12:16 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 22 Mar 2018 12:16:39 +0000 (12:16 +0000)
diff --cc aai-core/pom.xml
Simple merge
diff --cc aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java
Simple merge
diff --cc aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java
Simple merge
diff --cc aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
Simple merge
diff --cc pom.xml
Simple merge
author	James Forsyth <jf2512@att.com>
	Thu, 22 Mar 2018 12:16:39 +0000 (12:16 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 22 Mar 2018 12:16:39 +0000 (12:16 +0000)
		1	2
aai-core/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java	patch \|	diff1 \|	diff2 \|	blob \| history
aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java	patch \|	diff1 \|	diff2 \|	blob \| history
aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java	patch \|	diff1 \|	diff2 \|	blob \| history
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history