Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c4db1b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c4db1b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c4db1b0 Branch: refs/heads/trunk Commit: 8c4db1b0e8907d6d5c532051775a09f6541c7449 Parents: 895ec3e e4e3fd9 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Jan 17 03:43:03 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Jan 17 03:43:03 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c4db1b0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c4db1b0/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
