Fix build after openflowplugin merge. 32/15632/2
authorThomas Bachman <tbachman@yahoo.com>
Mon, 23 Feb 2015 20:27:42 +0000 (15:27 -0500)
committerThomas Bachman <tbachman@yahoo.com>
Mon, 23 Feb 2015 20:58:28 +0000 (20:58 +0000)
commitfa233c807e53a3775017d7ce6691032bf0d8175c
tree0236346b8e6730c6d287112412e0f28785cc9a33
parent6eac57f9c1035a2afc92f55a723f5a22e44f3fa6
Fix build after openflowplugin merge.

This fixes a build breakage caused by a merge in the openflowplugin project
which enabled flow programming models/features.

This patch also re-enables the single-feature-test that
was broken when moving this from yangtools to odlparent.

Lastly, this patch removes the OpenContrail feature from
automatic startup (we're migrating to per-renderer features
in a subsequent patch).

Change-Id: I09382b2cef32efbd542d45c070280e1963858c80
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
distribution-karaf/pom.xml
features/pom.xml
groupbasedpolicy/pom.xml