Updated Branches: refs/heads/cassandra-1.2 6bef66bce -> 0820b20fb refs/heads/trunk 5f36ece0f -> 4e9d01f50
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/4e9d01f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d01f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e9d01f5 Branch: refs/heads/trunk Commit: 4e9d01f506bf289c3ce4ac644ddea7519f16e112 Parents: 5f36ece 0820b20 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Feb 8 18:19:50 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Feb 8 18:19:50 2013 -0600 ---------------------------------------------------------------------- conf/cassandra-env.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e9d01f5/conf/cassandra-env.sh ----------------------------------------------------------------------
