Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edd7f459 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edd7f459 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edd7f459 Branch: refs/heads/trunk Commit: edd7f4590db1fae9ac9da1a086648b54e8844566 Parents: 8eccb80 4f4aa4f Author: Sylvain Lebresne <sylv...@riptano.com> Authored: Mon Feb 6 10:37:46 2012 +0100 Committer: Sylvain Lebresne <sylv...@riptano.com> Committed: Mon Feb 6 10:37:46 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 +- conf/cassandra-env.sh | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edd7f459/CHANGES.txt ----------------------------------------------------------------------
