karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anierb...@apache.org
Subject [2/2] git commit: Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Date Sun, 24 Aug 2014 11:08:20 GMT
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d4393975
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d4393975
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d4393975

Branch: refs/heads/karaf-3.0.x
Commit: d43939750a52805e01ced43ff5aeb40279c6dc0b
Parents: 4377928 31ace2b
Author: anierbeck <bcanhome@googlemail.com>
Authored: Sun Aug 24 13:08:05 2014 +0200
Committer: anierbeck <bcanhome@googlemail.com>
Committed: Sun Aug 24 13:08:05 2014 +0200

----------------------------------------------------------------------
 .../features/enterprise/src/main/feature/feature.xml    |  2 +-
 .../features/standard/src/main/feature/feature.xml      |  2 +-
 .../test/java/org/apache/karaf/itests/FeatureTest.java  | 12 +++---------
 .../java/org/apache/karaf/itests/KarafTestSupport.java  | 10 ++++++++++
 pom.xml                                                 |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------



Mime
View raw message