Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6a7a5be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6a7a5be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6a7a5be Branch: refs/heads/trunk Commit: f6a7a5be533ad39fe5af72fb2f1287b9c9d73bad Parents: 9d70cf3 df86e8f Author: Sylvain Lebresne <[email protected]> Authored: Fri Jan 31 13:28:26 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Jan 31 13:28:26 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6a7a5be/CHANGES.txt ----------------------------------------------------------------------
