Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4321111B72 for ; Sun, 24 Aug 2014 11:08:20 +0000 (UTC) Received: (qmail 87407 invoked by uid 500); 24 Aug 2014 11:08:20 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 87325 invoked by uid 500); 24 Aug 2014 11:08:20 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 87309 invoked by uid 99); 24 Aug 2014 11:08:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Aug 2014 11:08:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C5487955C55; Sun, 24 Aug 2014 11:08:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anierbeck@apache.org To: commits@karaf.apache.org Date: Sun, 24 Aug 2014 11:08:20 -0000 Message-Id: In-Reply-To: <634c84883e5846758804943643ad77b2@git.apache.org> References: <634c84883e5846758804943643ad77b2@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 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 Authored: Sun Aug 24 13:08:05 2014 +0200 Committer: anierbeck 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(-) ----------------------------------------------------------------------