git reRevert "features cleanup for Li proposal implementation" 69/18969/1
authorEd Warnicke <hagbard@gmail.com>
Thu, 23 Apr 2015 23:34:42 +0000 (16:34 -0700)
committerEd Warnicke <hagbard@gmail.com>
Thu, 23 Apr 2015 23:34:42 +0000 (16:34 -0700)
commit91ad8eec36c82e676b43087931e86cc6f436550c
treef65cdd79edb98ae761f7949b1f0302d05f629be1
parent8037154707df4eb3139c69f900f08e3bf71b8030
git reRevert "features cleanup for Li proposal implementation"

This reverts commit 7105851746e6d21f917b4b15cf638540c8056606.

Signed-off-by: Ed Warnicke <hagbard@gmail.com>
features/src/main/resources/features.xml
openflowplugin-controller-config/pom.xml
openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml [moved from openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-Li.xml with 100% similarity]
openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml [moved from openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-He.xml with 100% similarity]