svn commit: r1174241 - in /camel/branches/camel-2.7.x: ./ platforms/karaf/features/src/main/resources/features.xml

[da...@apache.org]

Author: davsclaus
Date: Thu Sep 22 16:12:49 2011
New Revision: 1174241

URL: http://svn.apache.org/viewvc?rev=1174241&view=rev
Log:
Merged revisions 1146903 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x


Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /camel/trunk:1146903

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 22 16:12:49 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146653,1146771
+/camel/branches/camel-2.8.x:1-1146127,1146653,1146771,1146903

Modified: camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml?rev=1174241&r1=1174240&r2=1174241&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml Thu Sep 22 16:12:49 2011
@@ -16,7 +16,7 @@
       See the License for the specific language governing permissions and
       limitations under the License.
 -->
-<features>
+<features name='camel-${pom.version}'>
   <feature name='camel' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-core</feature>
     <feature version='${pom.version}'>camel-spring</feature>