Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 BA7FD11945 for ; Mon, 5 May 2014 20:40:23 +0000 (UTC) Received: (qmail 8520 invoked by uid 500); 5 May 2014 20:40:23 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 8424 invoked by uid 500); 5 May 2014 20:40:23 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 8415 invoked by uid 99); 5 May 2014 20:40:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2014 20:40:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9F663911E45; Mon, 5 May 2014 20:40:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: high-scale-lib upgrade Date: Mon, 5 May 2014 20:40:22 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9881ea6b3 -> f0575f153 high-scale-lib upgrade Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0575f15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0575f15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0575f15 Branch: refs/heads/cassandra-2.1 Commit: f0575f153b8f0b0caa56f56cc5e93ebd3f784b8e Parents: 9881ea6 Author: T Jake Luciani Authored: Mon May 5 16:07:53 2014 -0400 Committer: T Jake Luciani Committed: Mon May 5 16:37:22 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.properties.default | 1 + build.xml | 8 ++++++-- lib/high-scale-lib-1.0.5.jar | Bin 0 -> 104776 bytes lib/high-scale-lib-1.1.2.jar | Bin 96046 -> 0 bytes 5 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a8b6ae4..553f764 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) * Add Google Compute Engine snitch (CASSANDRA-7132) + * Upgrade NBHM lib (CASSANDRA-7128) 2.1.0-beta2 * Increase default CL space to 8GB (CASSANDRA-7031) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.properties.default ---------------------------------------------------------------------- diff --git a/build.properties.default b/build.properties.default index ff6aea0..be9b23b 100644 --- a/build.properties.default +++ b/build.properties.default @@ -4,4 +4,5 @@ artifact.remoteRepository.java.net2: http://download.java.net/maven/2 artifact.remoteRepository.apache: https://repository.apache.org/content/repositories/releases artifact.remoteRepository.jclouds: http://jclouds.googlecode.com/svn/repo artifact.remoteRepository.oauth: http://oauth.googlecode.com/svn/code/maven +artifact.remoteRepository.boundary: http://maven.boundary.com/artifactory/external http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 898b141..e8d9dd9 100644 --- a/build.xml +++ b/build.xml @@ -283,6 +283,7 @@ + @@ -361,7 +362,7 @@ - + @@ -470,7 +471,7 @@ - + @@ -542,6 +543,7 @@ + @@ -567,6 +569,7 @@ + @@ -587,6 +590,7 @@ + http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.0.5.jar ---------------------------------------------------------------------- diff --git a/lib/high-scale-lib-1.0.5.jar b/lib/high-scale-lib-1.0.5.jar new file mode 100644 index 0000000..d184472 Binary files /dev/null and b/lib/high-scale-lib-1.0.5.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.1.2.jar ---------------------------------------------------------------------- diff --git a/lib/high-scale-lib-1.1.2.jar b/lib/high-scale-lib-1.1.2.jar deleted file mode 100644 index 6343a70..0000000 Binary files a/lib/high-scale-lib-1.1.2.jar and /dev/null differ