Updated Branches: refs/heads/trunk 8fa285c8b -> 9f668caed
Merge branch 'cassandra-1.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/9f668cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f668cae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f668cae Branch: refs/heads/trunk Commit: 9f668caed2421e27855adfa54a0dc93459398bc4 Parents: 8fa285c abd4555 Author: Chris Goffinet <c...@chrisgoffinet.com> Authored: Mon Feb 6 18:26:28 2012 -0800 Committer: Chris Goffinet <c...@chrisgoffinet.com> Committed: Mon Feb 6 18:26:28 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- conf/cassandra-env.sh | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f668cae/CHANGES.txt ----------------------------------------------------------------------
