Merge "Use AAAShiroFilter as TokenAuthFilter was deprecated in Be"

author Keith Burns <alagalah@gmail.com>

Mon, 2 May 2016 12:56:13 +0000 (12:56 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Mon, 2 May 2016 12:56:13 +0000 (12:56 +0000)
author Keith Burns <alagalah@gmail.com>
Mon, 2 May 2016 12:56:13 +0000 (12:56 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Mon, 2 May 2016 12:56:13 +0000 (12:56 +0000)
diff --cc features/pom.xml
Simple merge
diff --cc features/src/main/features/features.xml
Simple merge
author	Keith Burns <alagalah@gmail.com>
	Mon, 2 May 2016 12:56:13 +0000 (12:56 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Mon, 2 May 2016 12:56:13 +0000 (12:56 +0000)
		1	2
features/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
features/src/main/features/features.xml	patch \|	diff1 \|	diff2 \|	blob \| history