Updated Branches: refs/heads/cassandra-1.2 7347d968d -> 6bef66bce refs/heads/trunk 850440900 -> 5f36ece0f
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/5f36ece0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f36ece0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f36ece0 Branch: refs/heads/trunk Commit: 5f36ece0fcfafa51c4b7283d367c6baecbbb2c80 Parents: 8504409 6bef66b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Feb 8 18:02:49 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Feb 8 18:02:49 2013 -0600 ---------------------------------------------------------------------- conf/cassandra-env.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f36ece0/conf/cassandra-env.sh ----------------------------------------------------------------------
