You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/10/07 19:57:19 UTC

[1/2] git commit: Fix SP.sendToHintedEndpoints() javadoc

Updated Branches:
  refs/heads/cassandra-2.0 6a603046e -> 8e8db1f20


Fix SP.sendToHintedEndpoints() javadoc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d31ac14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d31ac14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d31ac14

Branch: refs/heads/cassandra-2.0
Commit: 9d31ac14dfec10ede53cbd6fecfd9a08c39bfa45
Parents: d396fd4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 8 01:55:29 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 8 01:55:29 2013 +0800

----------------------------------------------------------------------
 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/9d31ac14/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 8a6e52e..cdb0bd6 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -467,7 +467,7 @@ public class StorageProxy implements StorageProxyMBean
      * | off            |       >=1      | --> DO NOT fire hints. And DO NOT wait for them to complete.
      * | off            |       ANY      | --> DO NOT fire hints. And DO NOT wait for them to complete.
      *
-     * @throws TimeoutException if the hints cannot be written/enqueued
+     * @throws OverloadedException if the hints cannot be written/enqueued
      */
     public static void sendToHintedEndpoints(final RowMutation rm,
                                              Iterable<InetAddress> targets,


[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e8db1f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e8db1f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e8db1f2

Branch: refs/heads/cassandra-2.0
Commit: 8e8db1f20688eef9a89e112f2295d160c9c35075
Parents: 6a60304 9d31ac1
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 8 01:56:55 2013 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 8 01:56:55 2013 +0800

----------------------------------------------------------------------
 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/8e8db1f2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------