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/70360cf2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70360cf2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70360cf2 Branch: refs/heads/trunk Commit: 70360cf258dfa0a5c792c50f724fdaf02aee9375 Parents: 67ed337 1b1f0b0 Author: Dave Brosius <[email protected]> Authored: Thu May 8 00:39:50 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu May 8 00:39:50 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- conf/cassandra-env.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70360cf2/CHANGES.txt ----------------------------------------------------------------------
