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/7faff8db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7faff8db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7faff8db Branch: refs/heads/trunk Commit: 7faff8db777063b6fb5f206607e6bbe07c020d63 Parents: d3a9e8f 1d4caf4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jan 16 16:39:34 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jan 16 16:39:34 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7faff8db/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7faff8db/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
