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 98A0F1734A for ; Mon, 31 Aug 2015 05:39:07 +0000 (UTC) Received: (qmail 49236 invoked by uid 500); 31 Aug 2015 05:39:07 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 49204 invoked by uid 500); 31 Aug 2015 05:39:07 -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 49195 invoked by uid 99); 31 Aug 2015 05:39:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Aug 2015 05:39:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 56DF0DFBD5; Mon, 31 Aug 2015 05:39:07 +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: Mon, 31 Aug 2015 05:39:08 -0000 Message-Id: In-Reply-To: <4a1ab8603637422eaeed8e8d23d11112@git.apache.org> References: <4a1ab8603637422eaeed8e8d23d11112@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] karaf git commit: Merge branch 'patch-2' of https://github.com/davidmichaelkarr/karaf Merge branch 'patch-2' of https://github.com/davidmichaelkarr/karaf Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c322fa3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c322fa3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c322fa3 Branch: refs/heads/master Commit: 0c322fa3f4f918ee639770f837ed449eb97b7529 Parents: 92626bb d7299d6 Author: Jean-Baptiste Onofré Authored: Mon Aug 31 07:38:53 2015 +0200 Committer: Jean-Baptiste Onofré Committed: Mon Aug 31 07:38:53 2015 +0200 ---------------------------------------------------------------------- manual/src/main/webapp/quick-start.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------