Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f8c42d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f8c42d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f8c42d0 Branch: refs/heads/master Commit: 7f8c42d0fef609384de482cfd62c6c5f5402af64 Parents: 40e167c 95cb490 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Oct 10 11:17:30 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Oct 10 11:17:30 2013 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/conf/Property.java | 13 ++- pom.xml | 7 +- .../apache/accumulo/server/ServerConstants.java | 19 ++-- .../accumulo/server/fs/VolumeManagerImpl.java | 12 ++- .../server/tabletserver/InMemoryMap.java | 2 - .../server/tabletserver/MutationLog.java | 99 -------------------- 6 files changed, 30 insertions(+), 122 deletions(-) ----------------------------------------------------------------------
