Updated Branches: refs/heads/cassandra-1.1 346ac03c2 -> a12aa0815 refs/heads/trunk 8e503d8d9 -> 6ab4bd7a1
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/6ab4bd7a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ab4bd7a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ab4bd7a Branch: refs/heads/trunk Commit: 6ab4bd7a1a357a2709d6958f6c153270c3a4f8fa Parents: 8e503d8 a12aa08 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jul 11 09:28:56 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jul 11 09:28:56 2012 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ab4bd7a/conf/cassandra-env.sh ----------------------------------------------------------------------
