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/fc0cc0ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc0cc0ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc0cc0ec Branch: refs/heads/trunk Commit: fc0cc0ec21edeb843c62020d7704f1675f737848 Parents: 972184b 1ae996d Author: Brandon Williams <[email protected]> Authored: Wed Sep 11 09:36:25 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Sep 11 09:36:25 2013 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
