Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E666F200B5A for ; Thu, 4 Aug 2016 14:47:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E4E2B160AAE; Thu, 4 Aug 2016 12:47:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 372A9160AAB for ; Thu, 4 Aug 2016 14:47:15 +0200 (CEST) Received: (qmail 98359 invoked by uid 500); 4 Aug 2016 12:47:14 -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 98343 invoked by uid 99); 4 Aug 2016 12:47:14 -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, 04 Aug 2016 12:47:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FA96E08E8; Thu, 4 Aug 2016 12:47:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jgoodyear@apache.org To: commits@karaf.apache.org Date: Thu, 04 Aug 2016 12:47:15 -0000 Message-Id: In-Reply-To: <879a567ef4b2463abeca745b13c72ebf@git.apache.org> References: <879a567ef4b2463abeca745b13c72ebf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] karaf git commit: Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x archived-at: Thu, 04 Aug 2016 12:47:16 -0000 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/77b8adcb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/77b8adcb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/77b8adcb Branch: refs/heads/karaf-3.0.x Commit: 77b8adcbcac619f331571bc978698771b3339e97 Parents: 4740bb9 5a32d36 Author: jgoodyear Authored: Thu Aug 4 10:02:22 2016 -0230 Committer: jgoodyear Committed: Thu Aug 4 10:02:22 2016 -0230 ---------------------------------------------------------------------- .../org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------