Projects >> accumulo >>a8c3587d1ecf84a1b23ae7ed290d8f729da7a56d

Chunk
Conflicting content 
      }
    });

<<<<<<< HEAD
    watchers.add(new TabletGroupWatcher(this, new MetaDataStateStore(this, this), null));
    watchers.add(new TabletGroupWatcher(this, new RootTabletStateStore(this, this), watchers.get(0)));
=======
    Credentials systemCreds = SystemCredentials.get();
    // ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations
    watchers.add(new TabletGroupWatcher(this, new MetaDataStateStore(instance, systemCreds, null), null));
    watchers.add(new TabletGroupWatcher(this, new RootTabletStateStore(instance, systemCreds, null), watchers.get(0)));
>>>>>>> f2868c6210124afece595fd5adca04479cc827a1
    watchers.add(new TabletGroupWatcher(this, new ZooTabletStateStore(new ZooStore(zroot)), watchers.get(1)));
    for (TabletGroupWatcher watcher : watchers) {
      watcher.start();
Solution content 
      }
    });

    watchers.add(new TabletGroupWatcher(this, new MetaDataStateStore(this, this), null));
    watchers.add(new TabletGroupWatcher(this, new RootTabletStateStore(this, this), watchers.get(0)));
    watchers.add(new TabletGroupWatcher(this, new ZooTabletStateStore(new ZooStore(zroot)), watchers.get(1)));
    for (TabletGroupWatcher watcher : watchers) {
      watcher.start();
File
Master.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable