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/e473769f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e473769f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e473769f Branch: refs/heads/trunk Commit: e473769fbffb04669b45633378f849f614169a19 Parents: fa592a4 11e8dc1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Oct 11 21:44:44 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Oct 11 21:44:44 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ConsistencyLevel.java | 4 ++-- .../service/DatacenterWriteResponseHandler.java | 16 +++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e473769f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e473769f/src/java/org/apache/cassandra/db/ConsistencyLevel.java ----------------------------------------------------------------------
