This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 147e6ce0790f400572059eb1a22e5a3c60b429b1 Merge: 5e5c74f 42a3534 Author: Keith Turner <[email protected]> AuthorDate: Tue Jul 10 18:11:45 2018 -0400 Merge branch '1.9' .../org/apache/accumulo/core/conf/Property.java | 5 +-- .../java/org/apache/accumulo/master/Master.java | 36 ++++++++++++++++------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java index bb188ce,2f124e3..22e1b82 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@@ -168,6 -163,8 +169,7 @@@ import org.apache.zookeeper.data.Stat import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; + import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; /**
