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/93849e75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93849e75 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93849e75 Branch: refs/heads/trunk Commit: 93849e75b1b4bb988be2fe1bd7ed2b45f5fcd7c7 Parents: 8d3c08b 81bf2b0 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon May 12 20:11:48 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon May 12 20:11:48 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/memory/MemtableCleanerThread.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93849e75/CHANGES.txt ----------------------------------------------------------------------
