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/16bb16ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16bb16ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16bb16ed Branch: refs/heads/trunk Commit: 16bb16ed2ff112fb006c911fd15ae919f1c92574 Parents: 7fe5503 ab87f83 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 24 14:49:01 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 24 14:49:01 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ conf/cassandra-env.sh | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/16bb16ed/CHANGES.txt ----------------------------------------------------------------------
