accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] 01/01: Merge branch '1.9' into 2.0
Date Tue, 03 Sep 2019 16:02:59 GMT
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d04109d06a41a7ae190941380ee7afb36fa2b4ef
Merge: 1c19584 d077b46
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Tue Sep 3 11:52:56 2019 -0400

    Merge branch '1.9' into 2.0
    
     Conflicts resolved:
    	server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java

 .../main/java/org/apache/accumulo/master/TabletGroupWatcher.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --cc server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index db00210,6c98f72..b801e3b
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@@ -102,9 -103,9 +102,8 @@@ abstract class TabletGroupWatcher exten
    private static final int ASSINGMENT_BUFFER_MAX_LENGTH = 4096;
  
    private final Master master;
-   final TabletStateStore store;
-   final TabletGroupWatcher dependentWatcher;
- 
+   private final TabletStateStore store;
+   private final TabletGroupWatcher dependentWatcher;
 -
    final TableStats stats = new TableStats();
    private SortedSet<TServerInstance> lastScanServers = ImmutableSortedSet.of();
  


Mime
View raw message