Merge "Bump patch version" into amsterdam

author Ofir Sonsino <os0695@att.com>

Sun, 4 Feb 2018 11:22:39 +0000 (11:22 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Sun, 4 Feb 2018 11:22:39 +0000 (11:22 +0000)
author Ofir Sonsino <os0695@att.com>
Sun, 4 Feb 2018 11:22:39 +0000 (11:22 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Sun, 4 Feb 2018 11:22:39 +0000 (11:22 +0000)
diff --cc epsdk-app-onap/pom.xml
Simple merge
diff --cc pom.xml
Simple merge
author	Ofir Sonsino <os0695@att.com>
	Sun, 4 Feb 2018 11:22:39 +0000 (11:22 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Sun, 4 Feb 2018 11:22:39 +0000 (11:22 +0000)
		1	2
epsdk-app-onap/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history