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 9CCD7100F8 for ; Thu, 26 Dec 2013 21:48:12 +0000 (UTC) Received: (qmail 63819 invoked by uid 500); 26 Dec 2013 21:48:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63789 invoked by uid 500); 26 Dec 2013 21:48:12 -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 63774 invoked by uid 99); 26 Dec 2013 21:48:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Dec 2013 21:48:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 30F5951E05; Thu, 26 Dec 2013 21:48:11 +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: Thu, 26 Dec 2013 21:48:16 -0000 Message-Id: <8a9eb3e16653437faab6590de7efdbcc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/8] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 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/06cbd91e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/06cbd91e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/06cbd91e Branch: refs/heads/master Commit: 06cbd91e61445435f796964f0361614d628e9232 Parents: 86f5927 280b6a6 Author: Josh Elser Authored: Thu Dec 26 10:51:29 2013 -0500 Committer: Josh Elser Committed: Thu Dec 26 10:51:29 2013 -0500 ---------------------------------------------------------------------- .../src/test/resources/ClassLoaderTestA/Test.jar | Bin 748 -> 1570 bytes .../src/test/resources/ClassLoaderTestB/Test.jar | Bin 748 -> 1572 bytes .../src/test/resources/ClassLoaderTestC/Test.jar | Bin 748 -> 1571 bytes start/src/test/resources/HelloWorld2.jar | Bin 575 -> 1483 bytes test/src/test/resources/FooConstraint.jar | Bin 1079 -> 2130 bytes test/src/test/resources/TestCombinerX.jar | Bin 1525 -> 4335 bytes test/src/test/resources/TestCombinerY.jar | Bin 1524 -> 4335 bytes 7 files changed, 0 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/06cbd91e/test/src/test/resources/TestCombinerX.jar ---------------------------------------------------------------------- diff --cc test/src/test/resources/TestCombinerX.jar index d9451f7,0000000..849e447 mode 100644,000000..100644 Binary files differ http://git-wip-us.apache.org/repos/asf/accumulo/blob/06cbd91e/test/src/test/resources/TestCombinerY.jar ---------------------------------------------------------------------- diff --cc test/src/test/resources/TestCombinerY.jar index a3ce3ae,0000000..6cffd86 mode 100644,000000..100644 Binary files differ