Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db5c95cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db5c95cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db5c95cd Branch: refs/heads/trunk Commit: db5c95cdc5ba232c420d3a110ae1a7bc7821c22d Parents: 0c56a5e 1bd7ac3 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 25 15:28:28 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 25 15:28:28 2013 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
