Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8A95D1062E for ; Tue, 4 Feb 2014 00:19:33 +0000 (UTC) Received: (qmail 40312 invoked by uid 500); 4 Feb 2014 00:19:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 40058 invoked by uid 500); 4 Feb 2014 00:19:20 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 39880 invoked by uid 99); 4 Feb 2014 00:19:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Feb 2014 00:19:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 369EF314098; Tue, 4 Feb 2014 00:19:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 04 Feb 2014 00:19:26 -0000 Message-Id: <27649b82d5194bb5bb7d5d2680021547@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/16] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c95ccdea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c95ccdea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c95ccdea Branch: refs/heads/master Commit: c95ccdea26f159c5710f5a69ad294d0eb3718ac6 Parents: 3fd5fa9 c91647e Author: Josh Elser Authored: Mon Feb 3 18:53:53 2014 -0500 Committer: Josh Elser Committed: Mon Feb 3 18:53:53 2014 -0500 ---------------------------------------------------------------------- .../accumulo/start/classloader/AccumuloClassLoader.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------