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 82E0C18372 for ; Thu, 17 Dec 2015 06:47:16 +0000 (UTC) Received: (qmail 41725 invoked by uid 500); 17 Dec 2015 06:47:16 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 41692 invoked by uid 500); 17 Dec 2015 06:47:16 -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 41682 invoked by uid 99); 17 Dec 2015 06:47:16 -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, 17 Dec 2015 06:47:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A2B1E006B; Thu, 17 Dec 2015 06:47: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, 17 Dec 2015 06:47:17 -0000 Message-Id: <6daa8aafde9c4a6dabe44e5d0cd04682@git.apache.org> In-Reply-To: <7610f250bcd1468686032be7bc1ebc8e@git.apache.org> References: <7610f250bcd1468686032be7bc1ebc8e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] karaf git commit: Merge branch 'master' of https://github.com/kwesterfeld/karaf Merge branch 'master' of https://github.com/kwesterfeld/karaf Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6485ef2d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6485ef2d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6485ef2d Branch: refs/heads/master Commit: 6485ef2daac1eb94a352bf6acdf7c5dc16e109de Parents: 4c1a5ab fa5f3a6 Author: Jean-Baptiste Onofré Authored: Wed Dec 16 21:10:56 2015 +0100 Committer: Jean-Baptiste Onofré Committed: Wed Dec 16 21:10:56 2015 +0100 ---------------------------------------------------------------------- .../org/apache/karaf/jaas/boot/principal/GroupPrincipal.java | 6 ++++-- .../org/apache/karaf/jaas/boot/principal/RolePrincipal.java | 4 +++- .../org/apache/karaf/jaas/boot/principal/UserPrincipal.java | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) ----------------------------------------------------------------------