merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/532db4d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/532db4d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/532db4d2 Branch: refs/heads/trunk Commit: 532db4d24e96da7a65c104c4382d0097bd41037e Parents: aa2936a ec673ac Author: Jonathan Ellis <[email protected]> Authored: Fri Aug 2 12:19:01 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Aug 2 12:19:01 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/utils/StatusLogger.java | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/532db4d2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/532db4d2/src/java/org/apache/cassandra/utils/StatusLogger.java ----------------------------------------------------------------------
