You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/01 21:34:58 UTC

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1567dd4bdc2a701a0b1541e751d7c3ef0f0553e1
Parents: 8f20289 27df1bd
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Sep 1 14:34:46 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Sep 1 14:34:46 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             | 2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1567dd4b/CHANGES.txt
----------------------------------------------------------------------