Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbe607f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbe607f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbe607f9 Branch: refs/heads/cassandra-2.1 Commit: bbe607f92fe881faedd0d54ad8834b6b0fadc299 Parents: 6df3163 ad81cab Author: Sylvain Lebresne <[email protected]> Authored: Tue Mar 25 17:44:56 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Mar 25 17:44:56 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ConsistencyLevel.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbe607f9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbe607f9/src/java/org/apache/cassandra/db/ConsistencyLevel.java ----------------------------------------------------------------------
