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 B1967105B1 for ; Thu, 19 Dec 2013 14:31:53 +0000 (UTC) Received: (qmail 11209 invoked by uid 500); 19 Dec 2013 14:31:33 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 10986 invoked by uid 500); 19 Dec 2013 14:31:24 -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 10701 invoked by uid 99); 19 Dec 2013 14:31:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 14:31:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A7483EF9F; Thu, 19 Dec 2013 14:31:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org To: commits@karaf.apache.org Date: Thu, 19 Dec 2013 14:31:21 -0000 Message-Id: <4840f179160b4b089486d7de7b16b536@git.apache.org> In-Reply-To: <52698a63e32442088024aa81269856c6@git.apache.org> References: <52698a63e32442088024aa81269856c6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/19] git commit: Merge branch 'master' into jms_doc Merge branch 'master' into jms_doc Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/69ce8946 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/69ce8946 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/69ce8946 Branch: refs/heads/master Commit: 69ce8946b1e1f0d7ae5bdfcddb14997814cb0de1 Parents: e49e3e5 aed3b08 Author: Jean-Baptiste Onofré Authored: Wed Dec 18 14:54:35 2013 +0100 Committer: Jean-Baptiste Onofré Committed: Wed Dec 18 14:54:35 2013 +0100 ---------------------------------------------------------------------- .../src/main/resources/OSGI-INF/blueprint/webconsole-features.xml | 1 + .../gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml | 1 + .../src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml | 1 + 3 files changed, 3 insertions(+) ----------------------------------------------------------------------