From: Moiz Raja <moraja@cisco.com>
Date: Mon, 5 Jan 2015 23:08:13 +0000 (+0000)
Subject: Merge "Enhance karaf-parent with karaf.localFeature"
X-Git-Tag: release/lithium~732
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=65a42d265f05715437e760af145ebf9b864e13ba;hp=893028de8b014ac861d2ad2401278e9c6b46c521

Merge "Enhance karaf-parent with karaf.localFeature"
---

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index c8784a880d..06d8c8d99b 100644
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -178,6 +178,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <!-- no startupFeatures -->
             <bootFeatures>
               <feature>standard</feature>
+              <feature>${karaf.localFeature}</feature>
             </bootFeatures>
             <!-- no installedFeatures -->
           </configuration>