You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2019/04/17 12:05:09 UTC

[accumulo] branch master updated: Remove usage of Generated annotation from thrift code. (#1096)

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new c6e6c7a  Remove usage of Generated annotation from thrift code. (#1096)
c6e6c7a is described below

commit c6e6c7ae7ffd9ecd91422210359a9dd05c16e933
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Apr 17 08:05:04 2019 -0400

    Remove usage of Generated annotation from thrift code. (#1096)
    
    Thrift generated code uses the javax Generated annotation.  This
    annotation was previously included with Java.  In Java 11 its no longer
    present. Removing it from the generated code enables building with Java
    8 and Java 11.
---
 .../java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java  | 1 -
 .../org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java   | 1 -
 .../org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java   | 1 -
 .../java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java     | 1 -
 .../java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java | 1 -
 .../accumulo/core/clientImpl/thrift/TableOperationExceptionType.java    | 1 -
 .../core/clientImpl/thrift/ThriftNotActiveServiceException.java         | 1 -
 .../apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java | 1 -
 .../accumulo/core/clientImpl/thrift/ThriftTableOperationException.java  | 1 -
 .../java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java     | 1 -
 .../java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java    | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java | 1 -
 .../java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java  | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java  | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java   | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java   | 1 -
 .../src/main/java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java  | 1 -
 .../org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java  | 1 -
 .../org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java   | 1 -
 .../accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java      | 1 -
 core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKey.java   | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java  | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java   | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java   | 1 -
 core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRange.java | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java   | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java  | 1 -
 .../apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java  | 1 -
 .../main/java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java    | 1 -
 .../java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java  | 1 -
 .../java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java     | 1 -
 .../main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java  | 1 -
 core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java     | 1 -
 core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java | 1 -
 .../java/org/apache/accumulo/core/master/thrift/BulkImportState.java    | 1 -
 .../java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java   | 1 -
 .../main/java/org/apache/accumulo/core/master/thrift/Compacting.java    | 1 -
 .../main/java/org/apache/accumulo/core/master/thrift/DeadServer.java    | 1 -
 .../main/java/org/apache/accumulo/core/master/thrift/FateOperation.java | 1 -
 .../main/java/org/apache/accumulo/core/master/thrift/FateService.java   | 1 -
 .../org/apache/accumulo/core/master/thrift/MasterClientService.java     | 1 -
 .../java/org/apache/accumulo/core/master/thrift/MasterGoalState.java    | 1 -
 .../java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java  | 1 -
 .../main/java/org/apache/accumulo/core/master/thrift/MasterState.java   | 1 -
 .../java/org/apache/accumulo/core/master/thrift/RecoveryException.java  | 1 -
 .../java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java     | 1 -
 .../src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java | 1 -
 .../java/org/apache/accumulo/core/master/thrift/TabletLoadState.java    | 1 -
 .../java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java | 1 -
 .../main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java   | 1 -
 .../java/org/apache/accumulo/core/replication/thrift/KeyValues.java     | 1 -
 .../accumulo/core/replication/thrift/RemoteReplicationErrorCode.java    | 1 -
 .../accumulo/core/replication/thrift/RemoteReplicationException.java    | 1 -
 .../apache/accumulo/core/replication/thrift/ReplicationCoordinator.java | 1 -
 .../core/replication/thrift/ReplicationCoordinatorErrorCode.java        | 1 -
 .../core/replication/thrift/ReplicationCoordinatorException.java        | 1 -
 .../apache/accumulo/core/replication/thrift/ReplicationServicer.java    | 1 -
 .../main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java | 1 -
 .../apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java    | 1 -
 .../core/securityImpl/thrift/TAuthenticationTokenIdentifier.java        | 1 -
 .../java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java | 1 -
 .../org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java  | 1 -
 .../accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java       | 1 -
 .../java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java  | 1 -
 .../org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java  | 1 -
 .../java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java   | 1 -
 .../org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java  | 1 -
 .../org/apache/accumulo/core/tabletserver/thrift/CompactionType.java    | 1 -
 .../accumulo/core/tabletserver/thrift/ConstraintViolationException.java | 1 -
 .../org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java    | 1 -
 .../apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java | 1 -
 .../accumulo/core/tabletserver/thrift/NotServingTabletException.java    | 1 -
 .../java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java    | 1 -
 .../java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java     | 1 -
 .../java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java  | 1 -
 .../org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java  | 1 -
 .../accumulo/core/tabletserver/thrift/TSampleNotPresentException.java   | 1 -
 .../apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java | 1 -
 .../org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java | 1 -
 .../apache/accumulo/core/tabletserver/thrift/TabletClientService.java   | 1 -
 .../java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java  | 1 -
 .../apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java | 1 -
 core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java     | 1 -
 core/src/main/scripts/generate-thrift.sh                                | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java   | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java | 1 -
 .../org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java     | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java    | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java    | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java    | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java        | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java  | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java    | 1 -
 .../java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java | 1 -
 .../src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java  | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java     | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java   | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java  | 1 -
 .../java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java     | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java    | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java | 1 -
 .../src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java           | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java     | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java      | 1 -
 .../src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java | 1 -
 .../org/apache/accumulo/proxy/thrift/MutationsRejectedException.java    | 1 -
 .../java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java | 1 -
 .../org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java    | 1 -
 .../org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java    | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java | 1 -
 .../java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java   | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java    | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java         | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java    | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java   | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java    | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java     | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java      | 1 -
 .../main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java    | 1 -
 .../java/org/apache/accumulo/proxy/thrift/TableExistsException.java     | 1 -
 .../java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java   | 1 -
 .../src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java      | 1 -
 .../src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java  | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java | 1 -
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java | 1 -
 .../src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java     | 1 -
 .../src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java     | 1 -
 .../src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java   | 1 -
 .../src/main/java/org/apache/accumulo/tracer/thrift/TestService.java    | 1 -
 .../java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java   | 1 -
 136 files changed, 1 insertion(+), 136 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
index e87ecbb..9817954 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ClientService {
 
   public interface Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
index d4c6f66..9cc4ab2 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ConfigurationType implements org.apache.thrift.TEnum {
   CURRENT(0),
   SITE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
index ef15662..363f236 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum SecurityErrorCode implements org.apache.thrift.TEnum {
   DEFAULT_SECURITY_ERROR(0),
   BAD_CREDENTIALS(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
index 02f3efc..47fa207 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<TDiskUsage> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDiskUsage");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
index 1a65efb..6b14092 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TableOperation implements org.apache.thrift.TEnum {
   CREATE(0),
   DELETE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
index 2e1ea01..7764e3a 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TableOperationExceptionType implements org.apache.thrift.TEnum {
   EXISTS(0),
   NOTFOUND(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
index b2d5ca2..a907b91 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ThriftNotActiveServiceException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ThriftNotActiveServiceException, ThriftNotActiveServiceException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftNotActiveServiceException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftNotActiveServiceException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
index fe65361..690f00c 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ThriftSecurityException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSecurityException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSecurityException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
index f47f27d..4a89ddc 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ThriftTableOperationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ThriftTableOperationException, ThriftTableOperationException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftTableOperationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftTableOperationException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
index e7bcc1f..4948c70 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.clientImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ThriftTest {
 
   public interface Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
index b24b674..e70864e 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiScan, InitialMultiScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialMultiScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InitialMultiScan");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
index 3bdcca8..b4b955e 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class InitialScan implements org.apache.thrift.TBase<InitialScan, InitialScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InitialScan");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
index 5d553b8..c73576a 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fields>, java.io.Serializable, Cloneable, Comparable<IterInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IterInfo");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
index f71bad3..1b03f07 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFileInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MapFileInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapFileInfo");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
index b275684..f191f58 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult, MultiScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<MultiScanResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MultiScanResult");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
index d8c5e2c..feddb0e 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<ScanResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanResult");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
index 2a7ad99..4bf5402 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._Fields>, java.io.Serializable, Cloneable, Comparable<TCMResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCMResult");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
index 1251ef4..a9c542b 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TCMStatus implements org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
index 80406f9..1d50462 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
index c077648..7ffbcf2 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TCondition implements org.apache.thrift.TBase<TCondition, TCondition._Fields>, java.io.Serializable, Cloneable, Comparable<TCondition> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCondition");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
index 5c909d2..7ff730e 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TConditionalMutation implements org.apache.thrift.TBase<TConditionalMutation, TConditionalMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalMutation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConditionalMutation");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
index fbcb490..2dc0865 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TConditionalSession implements org.apache.thrift.TBase<TConditionalSession, TConditionalSession._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalSession> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConditionalSession");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
index da6bea0..dee6054 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TConstraintViolationSummary implements org.apache.thrift.TBase<TConstraintViolationSummary, TConstraintViolationSummary._Fields>, java.io.Serializable, Cloneable, Comparable<TConstraintViolationSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConstraintViolationSummary");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKey.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
index 65055a8..a4233cc 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.io.Serializable, Cloneable, Comparable<TKey> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TKey");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
index 81dc097..ffa429c 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExtent._Fields>, java.io.Serializable, Cloneable, Comparable<TKeyExtent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TKeyExtent");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
index 2aaa357..a9531c2 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TKeyValue implements org.apache.thrift.TBase<TKeyValue, TKeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<TKeyValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TKeyValue");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
index b240c6a..072f56b 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TMutation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TMutation");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRange.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
index e29d518..fd359ee 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, java.io.Serializable, Cloneable, Comparable<TRange> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRange");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
index a2608e3..13fce8d 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TRowRange implements org.apache.thrift.TBase<TRowRange, TRowRange._Fields>, java.io.Serializable, Cloneable, Comparable<TRowRange> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowRange");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
index 58d1096..f4583c1 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummaries._Fields>, java.io.Serializable, Cloneable, Comparable<TSummaries> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSummaries");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
index e2afd89..bc355dd 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TSummarizerConfiguration implements org.apache.thrift.TBase<TSummarizerConfiguration, TSummarizerConfiguration._Fields>, java.io.Serializable, Cloneable, Comparable<TSummarizerConfiguration> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSummarizerConfiguration");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
index 1a75f64..ad48f5a 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fields>, java.io.Serializable, Cloneable, Comparable<TSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSummary");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
index 8d68da4..803a76e 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest, TSummaryRequest._Fields>, java.io.Serializable, Cloneable, Comparable<TSummaryRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSummaryRequest");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
index 105a104..cde49ea 100644
--- a/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
+++ b/core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.dataImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, UpdateErrors._Fields>, java.io.Serializable, Cloneable, Comparable<UpdateErrors> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpdateErrors");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
index 3f0a950..e339319 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.gc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class GCMonitorService {
 
   public interface Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
index d9183ee..4dd934d 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.gc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fields>, java.io.Serializable, Cloneable, Comparable<GCStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GCStatus");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
index 610fe3c..a7e1e04 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.gc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCycleStats._Fields>, java.io.Serializable, Cloneable, Comparable<GcCycleStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GcCycleStats");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java
index 15c0592..e0c382d 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum BulkImportState implements org.apache.thrift.TEnum {
   INITIAL(0),
   MOVING(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
index 7866016..e555041 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatus, BulkImportStatus._Fields>, java.io.Serializable, Cloneable, Comparable<BulkImportStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BulkImportStatus");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java
index 3de67ee..8332c91 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class Compacting implements org.apache.thrift.TBase<Compacting, Compacting._Fields>, java.io.Serializable, Cloneable, Comparable<Compacting> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Compacting");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java
index cfcffc6..580cafe 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServer._Fields>, java.io.Serializable, Cloneable, Comparable<DeadServer> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DeadServer");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java
index 8c621d3..9e475eb 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum FateOperation implements org.apache.thrift.TEnum {
   TABLE_CREATE(0),
   TABLE_CLONE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
index 6edd756..a2386b4 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class FateService {
 
   public interface Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
index 47c23ce..f35eacb 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class MasterClientService {
 
   public interface Iface extends FateService.Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
index 7962629..4e5889a 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum MasterGoalState implements org.apache.thrift.TEnum {
   CLEAN_STOP(0),
   SAFE_MODE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
index dc25d9e..61b6ef0 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorInfo, MasterMonitorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MasterMonitorInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterMonitorInfo");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
index 2811115..7145df7 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum MasterState implements org.apache.thrift.TEnum {
   INITIAL(0),
   HAVE_LOCK(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java
index 83ff8cd..e817912 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class RecoveryException extends org.apache.thrift.TException implements org.apache.thrift.TBase<RecoveryException, RecoveryException._Fields>, java.io.Serializable, Cloneable, Comparable<RecoveryException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
index 1201881..4305cc8 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, RecoveryStatus._Fields>, java.io.Serializable, Cloneable, Comparable<RecoveryStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryStatus");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
index 7ba1987..5f891f0 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TableInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableInfo");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java
index 9bd9e34..9e4bf39 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TabletLoadState implements org.apache.thrift.TEnum {
   LOADED(0),
   LOAD_FAILURE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
index 260e72f..f332c00 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerStatus, TabletServerStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TabletServerStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletServerStatus");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
index 41c3170..dcd5147 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletSplit._Fields>, java.io.Serializable, Cloneable, Comparable<TabletSplit> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletSplit");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
index da55b89..0778377 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValues> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValues");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
index 66d2998..1d316cf 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum RemoteReplicationErrorCode implements org.apache.thrift.TEnum {
   COULD_NOT_DESERIALIZE(0),
   COULD_NOT_APPLY(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
index 259fc04..16d8ac7 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class RemoteReplicationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<RemoteReplicationException, RemoteReplicationException._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteReplicationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteReplicationException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
index be393c5..54dfa76 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ReplicationCoordinator {
 
   public interface Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
index a432601..8a2eb92 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ReplicationCoordinatorErrorCode implements org.apache.thrift.TEnum {
   NO_AVAILABLE_SERVERS(0),
   SERVICE_CONFIGURATION_UNAVAILABLE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
index 6e4979f..2f42f8e 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ReplicationCoordinatorException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ReplicationCoordinatorException, ReplicationCoordinatorException._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicationCoordinatorException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplicationCoordinatorException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
index b340fc1..01a0c15 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ReplicationServicer {
 
   public interface Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java
index 49d95be..2aa3b93 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class WalEdits implements org.apache.thrift.TBase<WalEdits, WalEdits._Fields>, java.io.Serializable, Cloneable, Comparable<WalEdits> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WalEdits");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
index 9679890..1be6e4b 100644
--- a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.securityImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticationKey, TAuthenticationKey._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthenticationKey> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthenticationKey");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
index 77fec90..4beefb2 100644
--- a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
+++ b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.securityImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<TAuthenticationTokenIdentifier, TAuthenticationTokenIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthenticationTokenIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthenticationTokenIdentifier");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
index 16d29c2..90e10a3 100644
--- a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.securityImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCredentials._Fields>, java.io.Serializable, Cloneable, Comparable<TCredentials> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCredentials");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
index 33647f4..9899f79 100644
--- a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.securityImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToken, TDelegationToken._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationToken> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelegationToken");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
index ba66f9c..8f3fe75 100644
--- a/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.securityImpl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegationTokenConfig, TDelegationTokenConfig._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationTokenConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelegationTokenConfig");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index acf3182..43f9d39 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionStats._Fields>, java.io.Serializable, Cloneable, Comparable<ActionStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActionStats");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
index d6b5e60..449d8a5 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
index 7264c60..a3ac38c 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveScan");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
index 7e75dc7..4c732c5 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum CompactionReason implements org.apache.thrift.TEnum {
   USER(0),
   SYSTEM(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
index 6b4b92b..873954b 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum CompactionType implements org.apache.thrift.TEnum {
   MINOR(0),
   MERGE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
index 2c36e59..7088ced 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ConstraintViolationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable, Comparable<ConstraintViolationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConstraintViolationException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
index 0313e47..03c711e 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, IteratorConfig._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorConfig");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index 5fa64a7..d1c741f 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class NoSuchScanIDException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchScanIDException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchScanIDException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
index 5894f33..4a22245 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class NotServingTabletException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable, Comparable<NotServingTabletException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotServingTabletException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
index 9588d00..355d515 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ScanState implements org.apache.thrift.TEnum {
   IDLE(0),
   RUNNING(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
index 5ecb7a7..0c7f7b3 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ScanType implements org.apache.thrift.TEnum {
   SINGLE(0),
   BATCH(1);
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
index 6da710f..3daefe8 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TDurability implements org.apache.thrift.TEnum {
   DEFAULT(0),
   SYNC(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
index 3785063..dfa743d 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSetting, TIteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<TIteratorSetting> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIteratorSetting");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
index 77d41e8..779c32e 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TSampleNotPresentException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TSampleNotPresentException, TSampleNotPresentException._Fields>, java.io.Serializable, Cloneable, Comparable<TSampleNotPresentException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSampleNotPresentException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
index e3731e3..f7c2a02 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerConfiguration, TSamplerConfiguration._Fields>, java.io.Serializable, Cloneable, Comparable<TSamplerConfiguration> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSamplerConfiguration");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
index 72bcd40..796fbc7 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TUnloadTabletGoal implements org.apache.thrift.TEnum {
   UNKNOWN(0),
   UNASSIGNED(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index 0555af8..7bc6570 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TabletClientService {
 
   public interface Iface extends org.apache.accumulo.core.clientImpl.thrift.ClientService.Iface {
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
index d1726fd..b39c13a 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TabletStats implements org.apache.thrift.TBase<TabletStats, TabletStats._Fields>, java.io.Serializable, Cloneable, Comparable<TabletStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletStats");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
index 5c48da2..cd2febc 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TooManyFilesException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TooManyFilesException, TooManyFilesException._Fields>, java.io.Serializable, Cloneable, Comparable<TooManyFilesException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TooManyFilesException");
 
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java b/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java
index 20dd666..852bcc0 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.trace.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TInfo implements org.apache.thrift.TBase<TInfo, TInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInfo");
 
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index cf8daa8..600000a 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -65,7 +65,7 @@ THRIFT_ARGS="${THRIFT_ARGS} -o $BUILD_DIR"
 mkdir -p $BUILD_DIR
 rm -rf $BUILD_DIR/gen-java
 for f in src/main/thrift/*.thrift; do
-  thrift ${THRIFT_ARGS} --gen java:generated_annotations=undated "$f" || fail unable to generate java thrift classes
+  thrift ${THRIFT_ARGS} --gen java:generated_annotations=suppress "$f" || fail unable to generate java thrift classes
   thrift ${THRIFT_ARGS} --gen py "$f" || fail unable to generate python thrift classes
   thrift ${THRIFT_ARGS} --gen rb "$f" || fail unable to generate ruby thrift classes
   thrift ${THRIFT_ARGS} --gen cpp "$f" || fail unable to generate cpp thrift classes
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
index c60ab7b..595ad42 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class AccumuloException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AccumuloException, AccumuloException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
index 1420a07..e8b5a63 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class AccumuloProxy {
 
   public interface Iface {
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
index b90db8d..2238f06 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class AccumuloSecurityException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AccumuloSecurityException, AccumuloSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloSecurityException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloSecurityException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
index 53436e3..d9308b8 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
index 6104b44..da41217 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveScan");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
index 5951770..fc79191 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOptions, BatchScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<BatchScanOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchScanOptions");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
index 860b851..0768535 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable, Comparable<Column> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Column");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
index ca53887..7a7a96a 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, ColumnUpdate._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnUpdate> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnUpdate");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
index 1f91be6..6068a76 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum CompactionReason implements org.apache.thrift.TEnum {
   USER(0),
   SYSTEM(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
index 9e268f8..44fc494 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class CompactionStrategyConfig implements org.apache.thrift.TBase<CompactionStrategyConfig, CompactionStrategyConfig._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionStrategyConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionStrategyConfig");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
index 58c047e..6588547 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum CompactionType implements org.apache.thrift.TEnum {
   MINOR(0),
   MERGE(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
index 64af6f7..3bc09a2 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class Condition implements org.apache.thrift.TBase<Condition, Condition._Fields>, java.io.Serializable, Cloneable, Comparable<Condition> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Condition");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
index 60d0c5f..2ac4a74 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ConditionalStatus implements org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
index 8fa9bab..28f464d 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUpdates, ConditionalUpdates._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalUpdates> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalUpdates");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
index 270dd92..492386b 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ConditionalWriterOptions implements org.apache.thrift.TBase<ConditionalWriterOptions, ConditionalWriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalWriterOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalWriterOptions");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
index aae9996..bd47226 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<DiskUsage> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DiskUsage");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
index dc38f33..43a0288 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum Durability implements org.apache.thrift.TEnum {
   DEFAULT(0),
   NONE(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
index f6bfb5a..0973702 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum IteratorScope implements org.apache.thrift.TEnum {
   MINC(0),
   MAJC(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
index 17b9491..411397c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting, IteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorSetting> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorSetting");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
index 6b0fab1..f487483 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class Key implements org.apache.thrift.TBase<Key, Key._Fields>, java.io.Serializable, Cloneable, Comparable<Key> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Key");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
index 7a4a354..6e3a379 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class KeyExtent implements org.apache.thrift.TBase<KeyExtent, KeyExtent._Fields>, java.io.Serializable, Cloneable, Comparable<KeyExtent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyExtent");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
index 20a273e..270397b 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class KeyValue implements org.apache.thrift.TBase<KeyValue, KeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValue");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
index 1b87852..917c789 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class KeyValueAndPeek implements org.apache.thrift.TBase<KeyValueAndPeek, KeyValueAndPeek._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValueAndPeek> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValueAndPeek");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java
index 604c1e9..b960cf4 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class MutationsRejectedException extends org.apache.thrift.TException implements org.apache.thrift.TBase<MutationsRejectedException, MutationsRejectedException._Fields>, java.io.Serializable, Cloneable, Comparable<MutationsRejectedException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MutationsRejectedException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
index d6f00b5..58a4618 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class NamespaceExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceExistsException, NamespaceExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceExistsException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceExistsException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java
index a333f61..612929a 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class NamespaceNotEmptyException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceNotEmptyException, NamespaceNotEmptyException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotEmptyException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotEmptyException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java
index fe0ef55..fa05c3c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class NamespaceNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceNotFoundException, NamespaceNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotFoundException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java
index f6acf67..6d53173 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum NamespacePermission implements org.apache.thrift.TEnum {
   READ(0),
   WRITE(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
index dfdea1d..859aaeb 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class NoMoreEntriesException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoMoreEntriesException, NoMoreEntriesException._Fields>, java.io.Serializable, Cloneable, Comparable<NoMoreEntriesException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoMoreEntriesException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
index 24a206c..b72d97c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum PartialKey implements org.apache.thrift.TEnum {
   ROW(0),
   ROW_COLFAM(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
index 2721d30..533f371 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, java.io.Serializable, Cloneable, Comparable<Range> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Range");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
index ff7c064..63a1e37 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ScanColumn implements org.apache.thrift.TBase<ScanColumn, ScanColumn._Fields>, java.io.Serializable, Cloneable, Comparable<ScanColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanColumn");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
index 1ad01a2..d2d35a5 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ScanOptions implements org.apache.thrift.TBase<ScanOptions, ScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ScanOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanOptions");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
index d1a72cc..d0d5a0c 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<ScanResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanResult");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
index 6d7f312..e5cc041 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ScanState implements org.apache.thrift.TEnum {
   IDLE(0),
   RUNNING(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
index 13523b4..9254b8b 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum ScanType implements org.apache.thrift.TEnum {
   SINGLE(0),
   BATCH(1);
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
index 0a14719..bc2557f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum SystemPermission implements org.apache.thrift.TEnum {
   GRANT(0),
   CREATE_TABLE(1),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
index 0beb377..fc09095 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TableExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TableExistsException, TableExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<TableExistsException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableExistsException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
index d53c718..3c465af 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TableNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TableNotFoundException, TableNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<TableNotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableNotFoundException");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
index b8c452f..b9716b2 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TablePermission implements org.apache.thrift.TEnum {
   READ(2),
   WRITE(3),
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
index 86575a9..41c54ee 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public enum TimeType implements org.apache.thrift.TEnum {
   LOGICAL(0),
   MILLIS(1);
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
index bb5b5d0..09bba8e 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class UnknownScanner extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownScanner, UnknownScanner._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownScanner> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownScanner");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
index bae5544..d7c8e48 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class UnknownWriter extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownWriter, UnknownWriter._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownWriter> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownWriter");
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
index 49d0859..2e29522 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class WriterOptions implements org.apache.thrift.TBase<WriterOptions, WriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<WriterOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriterOptions");
 
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
index 01f58d4..e4ad17b 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.tracer.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class Annotation implements org.apache.thrift.TBase<Annotation, Annotation._Fields>, java.io.Serializable, Cloneable, Comparable<Annotation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Annotation");
 
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java
index a4f945c..51fb434 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.tracer.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class RemoteSpan implements org.apache.thrift.TBase<RemoteSpan, RemoteSpan._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteSpan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteSpan");
 
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java
index bd0b817..fc35552 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.tracer.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class SpanReceiver {
 
   public interface Iface {
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
index 7fdfbb9..1f3667b 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.tracer.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class TestService {
 
   public interface Iface {
diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
index d68befa..56b371f 100644
--- a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
+++ b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
@@ -23,7 +23,6 @@
 package org.apache.accumulo.test.rpc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.12.0)")
 public class SimpleThriftService {
 
   public interface Iface {