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/c1d7291c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1d7291c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1d7291c Branch: refs/heads/trunk Commit: c1d7291c8d25808b76daebf4db1a55901f01f3ae Parents: e178ff4 8e82590 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 26 15:19:11 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 26 15:19:11 2013 -0600 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 -- 1 file changed, 2 deletions(-) ----------------------------------------------------------------------
