Projects >> accumulo >>8147b196a9589ac5b243b8aa8d4b224adabdcf42

Chunk
Conflicting content
  private static long gcTimeIncreasedCount;

  private static final long MAX_TIME_TO_WAIT_FOR_SCAN_RESULT_MILLIS = 1000;
<<<<<<< HEAD:server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
  private static final long RECENTLY_SPLIT_MILLIES = 60 * 1000;
=======
>>>>>>> f838cd9e4afa18f6854c49b089fb5e40e94b0958:server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
  private static final long TIME_BETWEEN_GC_CHECKS = 5000;
  
  private TabletServerLogger logger;
Solution content
  private static long gcTimeIncreasedCount;

  private static final long MAX_TIME_TO_WAIT_FOR_SCAN_RESULT_MILLIS = 1000;
  private static final long RECENTLY_SPLIT_MILLIES = 60 * 1000;
  private static final long TIME_BETWEEN_GC_CHECKS = 5000;
  
  private TabletServerLogger logger;
File
TabletServer.java
Developer's decision
Version 1
Kind of conflict
Attribute