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 7A3A017560 for ; Thu, 5 Feb 2015 10:42:12 +0000 (UTC) Received: (qmail 876 invoked by uid 500); 5 Feb 2015 10:42:12 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 847 invoked by uid 500); 5 Feb 2015 10:42:12 -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 838 invoked by uid 99); 5 Feb 2015 10:42:12 -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; Thu, 05 Feb 2015 10:42:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14FB6E01D9; Thu, 5 Feb 2015 10:42:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@karaf.apache.org Message-Id: <553d57d656d248c6a241a8fda1f9bb6f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: karaf git commit: KARAF-3504 Fix forgotten users.properties Date: Thu, 5 Feb 2015 10:42:12 +0000 (UTC) Repository: karaf Updated Branches: refs/heads/master b8b0a0e72 -> decd74c5c KARAF-3504 Fix forgotten users.properties Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/decd74c5 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/decd74c5 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/decd74c5 Branch: refs/heads/master Commit: decd74c5cd96a557888611eafefa318d483530a1 Parents: b8b0a0e Author: Christian Schneider Authored: Thu Feb 5 11:42:07 2015 +0100 Committer: Christian Schneider Committed: Thu Feb 5 11:42:07 2015 +0100 ---------------------------------------------------------------------- .../apache/karaf/instance/core/internal/InstanceServiceImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/decd74c5/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java ---------------------------------------------------------------------- diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java index 8a05605..7642225 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java @@ -329,6 +329,7 @@ public class InstanceServiceImpl implements InstanceService { "etc/org.ops4j.pax.logging.cfg", "etc/org.ops4j.pax.url.mvn.cfg", "etc/shell.init.script", + "etc/users.properties", FEATURES_CFG }; copyResourcesToDir(resources, karafBase, textResources, printOutput);