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/1e64972b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e64972b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e64972b Branch: refs/heads/cassandra-2.1 Commit: 1e64972be5c9237a10b4b2635206b0790d7489ff Parents: 9527b17 8526347 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Mar 17 11:03:47 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Mar 17 11:03:47 2014 +0100 ---------------------------------------------------------------------- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e64972b/NOTICE.txt ----------------------------------------------------------------------
