Merge branch 'cassandra-2.0' into trunk
Conflicts:
conf/cassandra-env.sh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b3a0a61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b3a0a61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b3a0a61
Branch: refs/heads/trunk
Commit: 0b3a0a6177484bff1cc031c123620829a0d29dcb
Parents: 9ef5383 b0b868f
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Oct 14 12:49:16 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Oct 14 12:49:16 2013 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
