Merge " Added new feature *odl-ovsdb-openstack-clusteraware*."

author Sam Hague <shague@redhat.com>

Tue, 12 Jan 2016 19:50:08 +0000 (19:50 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Tue, 12 Jan 2016 19:50:08 +0000 (19:50 +0000)
author Sam Hague <shague@redhat.com>
Tue, 12 Jan 2016 19:50:08 +0000 (19:50 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Tue, 12 Jan 2016 19:50:08 +0000 (19:50 +0000)
diff --cc features/pom.xml
Simple merge
diff --cc features/src/main/features/features.xml
Simple merge
author	Sam Hague <shague@redhat.com>
	Tue, 12 Jan 2016 19:50:08 +0000 (19:50 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Tue, 12 Jan 2016 19:50:08 +0000 (19:50 +0000)
		1	2
features/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
features/src/main/features/features.xml	patch \|	diff1 \|	diff2 \|	blob \| history