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 0543317EFD for ; Fri, 17 Apr 2015 16:24:43 +0000 (UTC) Received: (qmail 97105 invoked by uid 500); 17 Apr 2015 16:24:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96984 invoked by uid 500); 17 Apr 2015 16:24:42 -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 96881 invoked by uid 99); 17 Apr 2015 16:24:42 -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; Fri, 17 Apr 2015 16:24:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57D9CE0562; Fri, 17 Apr 2015 16:24:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Fri, 17 Apr 2015 16:24:45 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4fae855 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4fae855 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4fae855 Branch: refs/heads/trunk Commit: b4fae85578b1bd31d162be9cb58b03c0be9f853f Parents: 5d88ff4 724384a Author: Jonathan Ellis Authored: Fri Apr 17 11:24:19 2015 -0500 Committer: Jonathan Ellis Committed: Fri Apr 17 11:24:19 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/MurmurHash.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4fae855/src/java/org/apache/cassandra/utils/MurmurHash.java ----------------------------------------------------------------------