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/268f3cb1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/268f3cb1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/268f3cb1 Branch: refs/heads/trunk Commit: 268f3cb190311095fbadfb869959a2256d7da33d Parents: d276d0a d9dac01 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Dec 19 16:58:21 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Dec 19 16:58:21 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../cassandra/config/DatabaseDescriptor.java | 1 + .../apache/cassandra/service/StorageProxy.java | 42 ++++++++++++++++++-- 3 files changed, 42 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/268f3cb1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/268f3cb1/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/268f3cb1/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
