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/e449450b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e449450b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e449450b Branch: refs/heads/trunk Commit: e449450b8a18eabe0d2a3e62a2978c13199302af Parents: 2766711 bbad16b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Feb 28 15:15:17 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Feb 28 15:15:17 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e449450b/CHANGES.txt ----------------------------------------------------------------------
