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 997CD104E2 for ; Fri, 4 Oct 2013 03:18:16 +0000 (UTC) Received: (qmail 32330 invoked by uid 500); 4 Oct 2013 03:18:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32310 invoked by uid 500); 4 Oct 2013 03:18:16 -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 32302 invoked by uid 99); 4 Oct 2013 03:18: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; Fri, 04 Oct 2013 03:18:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AE8B490F395; Fri, 4 Oct 2013 03:18:15 +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, 04 Oct 2013 03:18:15 -0000 Message-Id: <7bcbe6865aa94c09ac2b3ff2a64eb8e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: one more consistencyLevel to pass along Updated Branches: refs/heads/cassandra-1.2 6025ba85b -> adb3a0dd7 refs/heads/cassandra-2.0 ff7d341ef -> ef69bd532 refs/heads/trunk 188a8b36e -> 53ac6b203 one more consistencyLevel to pass along Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adb3a0dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adb3a0dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adb3a0dd Branch: refs/heads/cassandra-1.2 Commit: adb3a0dd7139b65b9dbe79f6b42d299fab259f8e Parents: 6025ba8 Author: Jonathan Ellis Authored: Thu Oct 3 22:15:35 2013 -0500 Committer: Jonathan Ellis Committed: Thu Oct 3 22:15:35 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/adb3a0dd/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index f925fa7..ec33723 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -646,7 +646,7 @@ public class StorageProxy implements StorageProxyMBean while (iter.hasNext()) { target = iter.next(); - MessagingService.instance().sendRR(message, target, handler); + MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel); } return; }