summaryrefslogtreecommitdiffstats
path: root/sdnr/northbound/energysavings/provider/src/main/resources
diff options
context:
space:
mode:
authorCLAPP, GEORGE H (gc731h) <gc731h@att.com>2018-07-19 20:14:51 +0000
committerCLAPP, GEORGE H (gc731h) <gc731h@att.com>2018-07-19 21:30:08 +0000
commit026500f89289120c4d946c9e2cb8e94e37d6751f (patch)
tree132fd79f1f41784d77daf87cc6db36900220cba9 /sdnr/northbound/energysavings/provider/src/main/resources
parent10cd619b5e6e34b22b3239a2516f1ca491c87a3a (diff)
Rename package to new ccsdk/features repo
Rename the energysavings package to align with new ccsdk/features repo and update file structure Change-Id: I9404cc2aca5e6f3abe8decd89987478a7d6db295 Issue-ID: CCSDK-350 Signed-off-by: CLAPP, GEORGE H (gc731h) <gc731h@att.com>
Diffstat (limited to 'sdnr/northbound/energysavings/provider/src/main/resources')
-rw-r--r--sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 80d1d1a3f..61bd833a0 100644
--- a/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -16,7 +16,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
odl:type="default" />
<bean id="provider"
+<<<<<<< HEAD
class="org.onap.sdnc.northbound.sdnr.impl.EnergysavingsProvider"
+=======
+ class="org.onap.ccsdk.features.sdnr.northbound.EnergysavingsProvider"
+>>>>>>> 4a0fb45... Rename package to new ccsdk/features repo
init-method="init" destroy-method="close">
<argument ref="dataBroker" />
</bean>