Updated Branches: refs/heads/trunk cee521477 -> 40599fe4d
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40599fe4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40599fe4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40599fe4 Branch: refs/heads/trunk Commit: 40599fe4d429b5664b51dad388406b2339c247cd Parents: cee5214 5dc145f Author: Dave Brosius <[email protected]> Authored: Wed Nov 14 00:51:04 2012 -0500 Committer: Dave Brosius <[email protected]> Committed: Wed Nov 14 00:51:04 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/BlacklistedDirectories.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
