Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e2b4b96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e2b4b96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e2b4b96 Branch: refs/heads/trunk Commit: 3e2b4b96120a9b301cdfb8ac1eb8b86487adfa80 Parents: 49a7311 f91d320 Author: Sylvain Lebresne <[email protected]> Authored: Mon May 13 16:35:12 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon May 13 16:35:12 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e2b4b96/CHANGES.txt ----------------------------------------------------------------------
