Updated Branches: refs/heads/trunk 76bad8cec -> 1f8b9e37f
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/1f8b9e37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f8b9e37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f8b9e37 Branch: refs/heads/trunk Commit: 1f8b9e37fd9b1484fa39d89fff0cf9fc7fd0bc4c Parents: 76bad8c 7a90c74 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Feb 6 02:41:38 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Feb 6 02:41:38 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Directories.java | 1 + .../org/apache/cassandra/io/util/FileUtils.java | 20 ++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f8b9e37/CHANGES.txt ----------------------------------------------------------------------
