Projects >> accumulo >>3356e0b34dba7f756574ba3662fedac253951e4e

Chunk
Conflicting content 
  }

  public void enableTracing(Opts opts) throws Exception {
<<<<<<< HEAD
    DistributedTrace.enable("myHost", "myApp");
=======
    DistributedTrace.enable(opts.getInstance(), new ZooReader(opts.getInstance().getZooKeepers(), 15000), "myHost", "myApp");
>>>>>>> 0abfa273de10c80580e1a0a27ed59bca117e8190
  }

  public void execute(Opts opts) throws TableNotFoundException, InterruptedException, AccumuloException, AccumuloSecurityException, TableExistsException {
Solution content 
  }

  public void enableTracing(Opts opts) throws Exception {
    DistributedTrace.enable("myHost", "myApp");
  }

  public void execute(Opts opts) throws TableNotFoundException, InterruptedException, AccumuloException, AccumuloSecurityException, TableExistsException {
File
TracingExample.java
Developer's decision
Version 1
Kind of conflict
Method invocation