Updated Branches: refs/heads/trunk 2964951e0 -> 46689d88d
merge from cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46689d88 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46689d88 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46689d88 Branch: refs/heads/trunk Commit: 46689d88d54ca4edbf8c324eeb720a522a697b70 Parents: 2964951 de7aed5 Author: Dave Brosius <dbros...@apache.org> Authored: Mon Nov 12 23:13:56 2012 -0500 Committer: Dave Brosius <dbros...@apache.org> Committed: Mon Nov 12 23:13:56 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../cassandra/db/BlacklistedDirectories.java | 46 ++++++++++++-- .../cassandra/db/BlacklistedDirectoriesMBean.java | 29 +++++++++ 3 files changed, 69 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
