Merge "Move the default tokenStore service to aaa-h2 bundle"

author Ryan Goulding <ryandgoulding@gmail.com>

Thu, 22 Dec 2016 20:20:11 +0000 (20:20 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Thu, 22 Dec 2016 20:20:11 +0000 (20:20 +0000)
author Ryan Goulding <ryandgoulding@gmail.com>
Thu, 22 Dec 2016 20:20:11 +0000 (20:20 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Thu, 22 Dec 2016 20:20:11 +0000 (20:20 +0000)
diff --cc features/authn/pom.xml
Simple merge
diff --cc features/authn/src/main/features/features.xml
Simple merge
author	Ryan Goulding <ryandgoulding@gmail.com>
	Thu, 22 Dec 2016 20:20:11 +0000 (20:20 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Thu, 22 Dec 2016 20:20:11 +0000 (20:20 +0000)
		1	2
features/authn/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
features/authn/src/main/features/features.xml	patch \|	diff1 \|	diff2 \|	blob \| history