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/d06f7300 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d06f7300 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d06f7300 Branch: refs/heads/trunk Commit: d06f7300b1baa742110bb0bf36abe96220b4ae25 Parents: 48bf2b1 bbe607f Author: Sylvain Lebresne <[email protected]> Authored: Tue Mar 25 17:45:24 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Mar 25 17:45:24 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/d06f7300/CHANGES.txt ----------------------------------------------------------------------
