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/e48a00b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e48a00b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e48a00b6 Branch: refs/heads/trunk Commit: e48a00b6da33c84200d537613299116a6224766f Parents: 9ffb195 d267cf8 Author: Jason Brown <jasobr...@apple.com> Authored: Wed May 7 16:35:11 2014 -0700 Committer: Jason Brown <jasobr...@apple.com> Committed: Wed May 7 16:35:11 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- .../org/apache/cassandra/utils/BackgroundActivityMonitor.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e48a00b6/CHANGES.txt ----------------------------------------------------------------------
