Updated Branches: refs/heads/cassandra-1.1 de039598f -> 60dadc5dc refs/heads/trunk 9cd53fba6 -> f471b927b
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/f471b927 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f471b927 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f471b927 Branch: refs/heads/trunk Commit: f471b927bbe1f2e7b30ea005b3331be951449c4d Parents: 9cd53fb 60dadc5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Aug 30 13:43:24 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Aug 30 13:43:24 2012 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
