Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f024a61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f024a61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f024a61 Branch: refs/heads/trunk Commit: 0f024a6192f185b93439ae53a69ce113b363aaaa Parents: dc0102a e83304d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jan 6 08:25:56 2015 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jan 6 08:25:56 2015 -0600 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f024a61/conf/cassandra-env.sh ----------------------------------------------------------------------
