You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2018/05/17 20:06:39 UTC

[GitHub] asfgit closed pull request #490: Update to Thrift 0.11.0

asfgit closed pull request #490: Update to Thrift 0.11.0
URL: https://github.com/apache/accumulo/pull/490
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
index af65874e3c..b79cd0e390 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ClientService {
 
   public interface Iface {
@@ -154,7 +154,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -2258,6 +2258,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getRootTabletLocation_result getResult(I iface, getRootTabletLocation_args args) throws org.apache.thrift.TException {
         getRootTabletLocation_result result = new getRootTabletLocation_result();
         result.success = iface.getRootTabletLocation();
@@ -2278,6 +2283,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getInstanceId_result getResult(I iface, getInstanceId_args args) throws org.apache.thrift.TException {
         getInstanceId_result result = new getInstanceId_result();
         result.success = iface.getInstanceId();
@@ -2298,6 +2308,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getZooKeepers_result getResult(I iface, getZooKeepers_args args) throws org.apache.thrift.TException {
         getZooKeepers_result result = new getZooKeepers_result();
         result.success = iface.getZooKeepers();
@@ -2318,6 +2333,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public bulkImportFiles_result getResult(I iface, bulkImportFiles_args args) throws org.apache.thrift.TException {
         bulkImportFiles_result result = new bulkImportFiles_result();
         try {
@@ -2344,6 +2364,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public isActive_result getResult(I iface, isActive_args args) throws org.apache.thrift.TException {
         isActive_result result = new isActive_result();
         result.success = iface.isActive(args.tinfo, args.tid);
@@ -2365,6 +2390,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.TException {
         ping_result result = new ping_result();
         try {
@@ -2389,6 +2419,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getDiskUsage_result getResult(I iface, getDiskUsage_args args) throws org.apache.thrift.TException {
         getDiskUsage_result result = new getDiskUsage_result();
         try {
@@ -2415,6 +2450,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listLocalUsers_result getResult(I iface, listLocalUsers_args args) throws org.apache.thrift.TException {
         listLocalUsers_result result = new listLocalUsers_result();
         try {
@@ -2439,6 +2479,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createLocalUser_result getResult(I iface, createLocalUser_args args) throws org.apache.thrift.TException {
         createLocalUser_result result = new createLocalUser_result();
         try {
@@ -2463,6 +2508,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public dropLocalUser_result getResult(I iface, dropLocalUser_args args) throws org.apache.thrift.TException {
         dropLocalUser_result result = new dropLocalUser_result();
         try {
@@ -2487,6 +2537,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public changeLocalUserPassword_result getResult(I iface, changeLocalUserPassword_args args) throws org.apache.thrift.TException {
         changeLocalUserPassword_result result = new changeLocalUserPassword_result();
         try {
@@ -2511,6 +2566,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public authenticate_result getResult(I iface, authenticate_args args) throws org.apache.thrift.TException {
         authenticate_result result = new authenticate_result();
         try {
@@ -2536,6 +2596,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public authenticateUser_result getResult(I iface, authenticateUser_args args) throws org.apache.thrift.TException {
         authenticateUser_result result = new authenticateUser_result();
         try {
@@ -2561,6 +2626,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public changeAuthorizations_result getResult(I iface, changeAuthorizations_args args) throws org.apache.thrift.TException {
         changeAuthorizations_result result = new changeAuthorizations_result();
         try {
@@ -2585,6 +2655,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getUserAuthorizations_result getResult(I iface, getUserAuthorizations_args args) throws org.apache.thrift.TException {
         getUserAuthorizations_result result = new getUserAuthorizations_result();
         try {
@@ -2609,6 +2684,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasSystemPermission_result getResult(I iface, hasSystemPermission_args args) throws org.apache.thrift.TException {
         hasSystemPermission_result result = new hasSystemPermission_result();
         try {
@@ -2634,6 +2714,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasTablePermission_result getResult(I iface, hasTablePermission_args args) throws org.apache.thrift.TException {
         hasTablePermission_result result = new hasTablePermission_result();
         try {
@@ -2661,6 +2746,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasNamespacePermission_result getResult(I iface, hasNamespacePermission_args args) throws org.apache.thrift.TException {
         hasNamespacePermission_result result = new hasNamespacePermission_result();
         try {
@@ -2688,6 +2778,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantSystemPermission_result getResult(I iface, grantSystemPermission_args args) throws org.apache.thrift.TException {
         grantSystemPermission_result result = new grantSystemPermission_result();
         try {
@@ -2712,6 +2807,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeSystemPermission_result getResult(I iface, revokeSystemPermission_args args) throws org.apache.thrift.TException {
         revokeSystemPermission_result result = new revokeSystemPermission_result();
         try {
@@ -2736,6 +2836,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantTablePermission_result getResult(I iface, grantTablePermission_args args) throws org.apache.thrift.TException {
         grantTablePermission_result result = new grantTablePermission_result();
         try {
@@ -2762,6 +2867,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeTablePermission_result getResult(I iface, revokeTablePermission_args args) throws org.apache.thrift.TException {
         revokeTablePermission_result result = new revokeTablePermission_result();
         try {
@@ -2788,6 +2898,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantNamespacePermission_result getResult(I iface, grantNamespacePermission_args args) throws org.apache.thrift.TException {
         grantNamespacePermission_result result = new grantNamespacePermission_result();
         try {
@@ -2814,6 +2929,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeNamespacePermission_result getResult(I iface, revokeNamespacePermission_args args) throws org.apache.thrift.TException {
         revokeNamespacePermission_result result = new revokeNamespacePermission_result();
         try {
@@ -2840,6 +2960,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getConfiguration_result getResult(I iface, getConfiguration_args args) throws org.apache.thrift.TException {
         getConfiguration_result result = new getConfiguration_result();
         result.success = iface.getConfiguration(args.tinfo, args.credentials, args.type);
@@ -2860,6 +2985,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTableConfiguration_result getResult(I iface, getTableConfiguration_args args) throws org.apache.thrift.TException {
         getTableConfiguration_result result = new getTableConfiguration_result();
         try {
@@ -2884,6 +3014,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getNamespaceConfiguration_result getResult(I iface, getNamespaceConfiguration_args args) throws org.apache.thrift.TException {
         getNamespaceConfiguration_result result = new getNamespaceConfiguration_result();
         try {
@@ -2908,6 +3043,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkClass_result getResult(I iface, checkClass_args args) throws org.apache.thrift.TException {
         checkClass_result result = new checkClass_result();
         result.success = iface.checkClass(args.tinfo, args.credentials, args.className, args.interfaceMatch);
@@ -2929,6 +3069,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkTableClass_result getResult(I iface, checkTableClass_args args) throws org.apache.thrift.TException {
         checkTableClass_result result = new checkTableClass_result();
         try {
@@ -2956,6 +3101,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkNamespaceClass_result getResult(I iface, checkNamespaceClass_args args) throws org.apache.thrift.TException {
         checkNamespaceClass_result result = new checkNamespaceClass_result();
         try {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
index 2f4735bbcd..b626df4881 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 
-
 public enum ConfigurationType implements org.apache.thrift.TEnum {
   CURRENT(0),
   SITE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
index 28e83c75ad..482fcc564c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 
-
 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/client/impl/thrift/TDiskUsage.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
index 7058f3bd13..8306fd273e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/client/impl/thrift/TableOperation.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
index 1cbcb8e8d0..6cd0a62fcf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 
-
 public enum TableOperation implements org.apache.thrift.TEnum {
   CREATE(0),
   DELETE(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
index 998f91cb3d..3902386d4b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 
-
 public enum TableOperationExceptionType implements org.apache.thrift.TEnum {
   EXISTS(0),
   NOTFOUND(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftNotActiveServiceException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftNotActiveServiceException.java
index ec9f32e52a..e783824dce 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftNotActiveServiceException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftNotActiveServiceException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/client/impl/thrift/ThriftSecurityException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
index e1678d6b4c..bc9516791b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/client/impl/thrift/ThriftTableOperationException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
index 5912b8bb20..db87cf0893 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/client/impl/thrift/ThriftTest.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
index a8ec8c9436..f79034945b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ThriftTest {
 
   public interface Iface {
@@ -46,7 +46,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -272,6 +272,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public success_result getResult(I iface, success_args args) throws org.apache.thrift.TException {
         success_result result = new success_result();
         result.success = iface.success();
@@ -293,6 +298,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public fails_result getResult(I iface, fails_args args) throws org.apache.thrift.TException {
         fails_result result = new fails_result();
         result.success = iface.fails();
@@ -314,6 +324,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public throwsError_result getResult(I iface, throwsError_args args) throws org.apache.thrift.TException {
         throwsError_result result = new throwsError_result();
         try {
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
index b3573cc079..f9b9c749e1 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/InitialScan.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
index 34e54c8949..678ea4cbf2 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/IterInfo.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
index dcb2f68b18..74ee38ff43 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/MapFileInfo.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
index 5b873f1808..b99c6c6208 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/MultiScanResult.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
index fe918ffca9..f55163859a 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/ScanResult.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
index 2241aecc33..934026909e 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TCMResult.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
index 086cb40a38..c0ab3d731b 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TCMStatus.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
index 70137af6cd..b80004205c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.data.thrift;
 
 
-
 public enum TCMStatus implements org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
index a3027be357..ba03cdcd34 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TCondition.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
index 6fec05b1d3..afa6c1d649 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TConditionalMutation.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
index 86dbb9a4e7..2a60b5d858 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TConditionalSession.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
index aea4732559..ca03883811 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TConstraintViolationSummary.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
index e351b19c5c..26b50cd616 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TKey.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
index 9121dfdb2f..fbbcea9472 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TKeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
index 283c9bf696..e157167be1 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TKeyValue.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
index 4968dec444..04bc1cb34a 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TMutation.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
index 79fe3b1f8a..721d0061b3 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TRange.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
index c90b213483..fa29f0a586 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TRowRange.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRowRange.java
index 5d1c0628fa..f317390768 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRowRange.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRowRange.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TSummaries.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaries.java
index 1c860ffaf3..0b54f5526f 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaries.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaries.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TSummarizerConfiguration.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummarizerConfiguration.java
index c4a72f3929..b546fbfbd8 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummarizerConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummarizerConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TSummary.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummary.java
index 64b49c2185..9567ff7a4a 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/TSummaryRequest.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaryRequest.java
index 78c242ebd0..a6491d820f 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaryRequest.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TSummaryRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/data/thrift/UpdateErrors.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
index 3a37af2213..db557eeda9 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.data.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 6b8da94349..c74bfd94f8 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.gc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class GCMonitorService {
 
   public interface Iface {
@@ -38,7 +38,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -168,6 +168,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getStatus_result getResult(I iface, getStatus_args args) throws org.apache.thrift.TException {
         getStatus_result result = new getStatus_result();
         try {
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 02012ce4a8..5a79466e81 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.gc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 b1eb415b27..e160a8f492 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.gc.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 6a77ae8dc5..a5800888c5 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-
 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 c6da29074d..d81ce1bf58 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 a25f332b8b..de8e1d0f71 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 a567c7fa9e..043b690db0 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 45ce87c602..4d74f05811 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-
 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 959c4a49a5..f72106e6ce 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class FateService {
 
   public interface Iface {
@@ -50,7 +50,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -409,6 +409,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public beginFateOperation_result getResult(I iface, beginFateOperation_args args) throws org.apache.thrift.TException {
         beginFateOperation_result result = new beginFateOperation_result();
         try {
@@ -436,6 +441,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public executeFateOperation_result getResult(I iface, executeFateOperation_args args) throws org.apache.thrift.TException {
         executeFateOperation_result result = new executeFateOperation_result();
         try {
@@ -464,6 +474,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public waitForFateOperation_result getResult(I iface, waitForFateOperation_args args) throws org.apache.thrift.TException {
         waitForFateOperation_result result = new waitForFateOperation_result();
         try {
@@ -492,6 +507,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public finishFateOperation_result getResult(I iface, finishFateOperation_args args) throws org.apache.thrift.TException {
         finishFateOperation_result result = new finishFateOperation_result();
         try {
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 1612d1bc4d..1b899ee16d 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class MasterClientService {
 
   public interface Iface extends FateService.Iface {
@@ -1426,6 +1426,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public initiateFlush_result getResult(I iface, initiateFlush_args args) throws org.apache.thrift.TException {
         initiateFlush_result result = new initiateFlush_result();
         try {
@@ -1455,6 +1460,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public waitForFlush_result getResult(I iface, waitForFlush_args args) throws org.apache.thrift.TException {
         waitForFlush_result result = new waitForFlush_result();
         try {
@@ -1483,6 +1493,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setTableProperty_result getResult(I iface, setTableProperty_args args) throws org.apache.thrift.TException {
         setTableProperty_result result = new setTableProperty_result();
         try {
@@ -1511,6 +1526,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeTableProperty_result getResult(I iface, removeTableProperty_args args) throws org.apache.thrift.TException {
         removeTableProperty_result result = new removeTableProperty_result();
         try {
@@ -1539,6 +1559,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setNamespaceProperty_result getResult(I iface, setNamespaceProperty_args args) throws org.apache.thrift.TException {
         setNamespaceProperty_result result = new setNamespaceProperty_result();
         try {
@@ -1567,6 +1592,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceProperty_result getResult(I iface, removeNamespaceProperty_args args) throws org.apache.thrift.TException {
         removeNamespaceProperty_result result = new removeNamespaceProperty_result();
         try {
@@ -1595,6 +1625,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setMasterGoalState_result getResult(I iface, setMasterGoalState_args args) throws org.apache.thrift.TException {
         setMasterGoalState_result result = new setMasterGoalState_result();
         try {
@@ -1621,6 +1656,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public shutdown_result getResult(I iface, shutdown_args args) throws org.apache.thrift.TException {
         shutdown_result result = new shutdown_result();
         try {
@@ -1647,6 +1687,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public shutdownTabletServer_result getResult(I iface, shutdownTabletServer_args args) throws org.apache.thrift.TException {
         shutdownTabletServer_result result = new shutdownTabletServer_result();
         try {
@@ -1673,6 +1718,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setSystemProperty_result getResult(I iface, setSystemProperty_args args) throws org.apache.thrift.TException {
         setSystemProperty_result result = new setSystemProperty_result();
         try {
@@ -1699,6 +1749,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeSystemProperty_result getResult(I iface, removeSystemProperty_args args) throws org.apache.thrift.TException {
         removeSystemProperty_result result = new removeSystemProperty_result();
         try {
@@ -1725,6 +1780,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getMasterStats_result getResult(I iface, getMasterStats_args args) throws org.apache.thrift.TException {
         getMasterStats_result result = new getMasterStats_result();
         try {
@@ -1751,6 +1811,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public waitForBalance_result getResult(I iface, waitForBalance_args args) throws org.apache.thrift.TException {
         waitForBalance_result result = new waitForBalance_result();
         try {
@@ -1775,6 +1840,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, reportSplitExtent_args args) throws org.apache.thrift.TException {
         iface.reportSplitExtent(args.tinfo, args.credentials, args.serverName, args.split);
         return null;
@@ -1794,6 +1864,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, reportTabletStatus_args args) throws org.apache.thrift.TException {
         iface.reportTabletStatus(args.tinfo, args.credentials, args.serverName, args.status, args.tablet);
         return null;
@@ -1813,6 +1888,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveTservers_result getResult(I iface, getActiveTservers_args args) throws org.apache.thrift.TException {
         getActiveTservers_result result = new getActiveTservers_result();
         try {
@@ -1839,6 +1919,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getDelegationToken_result getResult(I iface, getDelegationToken_args args) throws org.apache.thrift.TException {
         getDelegationToken_result result = new getDelegationToken_result();
         try {
@@ -1865,6 +1950,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public drainReplicationTable_result getResult(I iface, drainReplicationTable_args args) throws org.apache.thrift.TException {
         drainReplicationTable_result result = new drainReplicationTable_result();
         try {
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 36eea214e4..6585056a05 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-
 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 f6be4d6cfa..6de0f9e1f2 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 28fa329162..9eacb2700d 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-
 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 7b1c9a177e..aefa572d25 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 527589760c..b37f38c635 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 d122cf4b8e..e4ee25b083 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 5f1adf1235..2c647ea2c7 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-
 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 32b4c3e844..f5a36e4255 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 ace2df8fd2..232ff691f7 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.master.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 4a1aa0924d..8846623c3a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 464b3e6f27..7700b120cc 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 
-
 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 db22b3ef85..ec05e8d3db 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 c15ba25a34..0c5e64ab9f 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ReplicationCoordinator {
 
   public interface Iface {
@@ -38,7 +38,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -168,6 +168,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getServicerAddress_result getResult(I iface, getServicerAddress_args args) throws org.apache.thrift.TException {
         getServicerAddress_result result = new getServicerAddress_result();
         try {
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 57e0139044..bd5e24272e 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.replication.thrift;
 
 
-
 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 58200299ff..e012fe8287 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 5fddb64f4e..719e8f9705 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ReplicationServicer {
 
   public interface Iface {
@@ -42,7 +42,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -243,6 +243,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public replicateLog_result getResult(I iface, replicateLog_args args) throws org.apache.thrift.TException {
         replicateLog_result result = new replicateLog_result();
         try {
@@ -268,6 +273,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public replicateKeyValues_result getResult(I iface, replicateKeyValues_args args) throws org.apache.thrift.TException {
         replicateKeyValues_result result = new replicateKeyValues_result();
         try {
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 5502d1336f..e7991e506a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.replication.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/rpc/TServiceClientWrapper.java b/core/src/main/java/org/apache/accumulo/core/rpc/TServiceClientWrapper.java
deleted file mode 100644
index 14027e72b6..0000000000
--- a/core/src/main/java/org/apache/accumulo/core/rpc/TServiceClientWrapper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.rpc;
-
-import org.apache.thrift.TApplicationException;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TException;
-import org.apache.thrift.TServiceClient;
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TMessageType;
-import org.apache.thrift.protocol.TProtocol;
-
-// Wrapper for THRIFT-4062 workaround; shouldn't be needed in newer versions
-// Also update generate-thrift.sh to stop using this
-public abstract class TServiceClientWrapper extends TServiceClient {
-
-  public TServiceClientWrapper(TProtocol iprot, TProtocol oprot) {
-    super(iprot, oprot);
-  }
-
-  public TServiceClientWrapper(TProtocol prot) {
-    super(prot);
-  }
-
-  @Override
-  protected void receiveBase(TBase<?,?> result, String methodName) throws TException {
-    TMessage msg = iprot_.readMessageBegin();
-    if (msg.type == TMessageType.EXCEPTION) {
-      TApplicationException x = new TApplicationException();
-      x.read(iprot_);
-      iprot_.readMessageEnd();
-      throw x;
-    }
-    if (msg.seqid != seqid_) {
-      throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID,
-          String.format("%s failed: out of sequence response: expected %d but got %d", methodName,
-              seqid_, msg.seqid));
-    }
-    result.read(iprot_);
-    iprot_.readMessageEnd();
-  }
-
-}
diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java
index d4d2ef3a2a..3fe103c12f 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.security.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/security/thrift/TAuthenticationTokenIdentifier.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java
index 872f6b8cb3..f64dbb83f4 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.security.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/security/thrift/TCredentials.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java
index fd7a5e19ff..b9212be931 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.security.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/security/thrift/TDelegationToken.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
index ade9302ce3..d1da4ea97e 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.security.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/security/thrift/TDelegationTokenConfig.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
index 1025b076cd..a12218499b 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.security.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 03c937a86d..49d153889e 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 fa9dbd4576..acc98d350c 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 8575f301dd..e280186339 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 53466742d6..f884d638f0 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-
 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 6d420b3ddc..edfb86d2bf 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-
 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 f9081c2f37..aa4fc59e17 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 5eca0e9a61..428307e950 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 e2a1d50838..8dfe20d12f 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 ed7bd0435f..c4c5d3dc18 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 7600e88001..57dd179754 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-
 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 b33ea4a2f2..4ed309e202 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-
 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 b00546d9cb..8130743e18 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-
 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 a4f5d7c03a..03b7c47499 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 92393f1145..dfb8869670 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 61ae185312..6efe71ce90 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 ecabca4431..f1be34045a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 
-
 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 5b71a5ebd7..7bb083d2a9 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class TabletClientService {
 
   public interface Iface extends org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
@@ -2648,6 +2648,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startScan_result getResult(I iface, startScan_args args) throws org.apache.thrift.TException {
         startScan_result result = new startScan_result();
         try {
@@ -2678,6 +2683,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public continueScan_result getResult(I iface, continueScan_args args) throws org.apache.thrift.TException {
         continueScan_result result = new continueScan_result();
         try {
@@ -2708,6 +2718,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, closeScan_args args) throws org.apache.thrift.TException {
         iface.closeScan(args.tinfo, args.scanID);
         return null;
@@ -2727,6 +2742,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startMultiScan_result getResult(I iface, startMultiScan_args args) throws org.apache.thrift.TException {
         startMultiScan_result result = new startMultiScan_result();
         try {
@@ -2753,6 +2773,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public continueMultiScan_result getResult(I iface, continueMultiScan_args args) throws org.apache.thrift.TException {
         continueMultiScan_result result = new continueMultiScan_result();
         try {
@@ -2779,6 +2804,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeMultiScan_result getResult(I iface, closeMultiScan_args args) throws org.apache.thrift.TException {
         closeMultiScan_result result = new closeMultiScan_result();
         try {
@@ -2803,6 +2833,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startUpdate_result getResult(I iface, startUpdate_args args) throws org.apache.thrift.TException {
         startUpdate_result result = new startUpdate_result();
         try {
@@ -2828,6 +2863,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, applyUpdates_args args) throws org.apache.thrift.TException {
         iface.applyUpdates(args.tinfo, args.updateID, args.keyExtent, args.mutations);
         return null;
@@ -2847,6 +2887,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeUpdate_result getResult(I iface, closeUpdate_args args) throws org.apache.thrift.TException {
         closeUpdate_result result = new closeUpdate_result();
         try {
@@ -2871,6 +2916,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public update_result getResult(I iface, update_args args) throws org.apache.thrift.TException {
         update_result result = new update_result();
         try {
@@ -2899,6 +2949,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startConditionalUpdate_result getResult(I iface, startConditionalUpdate_args args) throws org.apache.thrift.TException {
         startConditionalUpdate_result result = new startConditionalUpdate_result();
         try {
@@ -2923,6 +2978,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public conditionalUpdate_result getResult(I iface, conditionalUpdate_args args) throws org.apache.thrift.TException {
         conditionalUpdate_result result = new conditionalUpdate_result();
         try {
@@ -2947,6 +3007,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public invalidateConditionalUpdate_result getResult(I iface, invalidateConditionalUpdate_args args) throws org.apache.thrift.TException {
         invalidateConditionalUpdate_result result = new invalidateConditionalUpdate_result();
         iface.invalidateConditionalUpdate(args.tinfo, args.sessID);
@@ -2967,6 +3032,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, closeConditionalUpdate_args args) throws org.apache.thrift.TException {
         iface.closeConditionalUpdate(args.tinfo, args.sessID);
         return null;
@@ -2986,6 +3056,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public bulkImport_result getResult(I iface, bulkImport_args args) throws org.apache.thrift.TException {
         bulkImport_result result = new bulkImport_result();
         try {
@@ -3010,6 +3085,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, loadFiles_args args) throws org.apache.thrift.TException {
         iface.loadFiles(args.tinfo, args.credentials, args.tid, args.keyExtent, args.dir, args.files, args.setTime);
         return null;
@@ -3029,6 +3109,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public splitTablet_result getResult(I iface, splitTablet_args args) throws org.apache.thrift.TException {
         splitTablet_result result = new splitTablet_result();
         try {
@@ -3055,6 +3140,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, loadTablet_args args) throws org.apache.thrift.TException {
         iface.loadTablet(args.tinfo, args.credentials, args.lock, args.extent);
         return null;
@@ -3074,6 +3164,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, unloadTablet_args args) throws org.apache.thrift.TException {
         iface.unloadTablet(args.tinfo, args.credentials, args.lock, args.extent, args.goal, args.requestTime);
         return null;
@@ -3093,6 +3188,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, flush_args args) throws org.apache.thrift.TException {
         iface.flush(args.tinfo, args.credentials, args.lock, args.tableId, args.startRow, args.endRow);
         return null;
@@ -3112,6 +3212,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, flushTablet_args args) throws org.apache.thrift.TException {
         iface.flushTablet(args.tinfo, args.credentials, args.lock, args.extent);
         return null;
@@ -3131,6 +3236,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, chop_args args) throws org.apache.thrift.TException {
         iface.chop(args.tinfo, args.credentials, args.lock, args.extent);
         return null;
@@ -3150,6 +3260,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, compact_args args) throws org.apache.thrift.TException {
         iface.compact(args.tinfo, args.credentials, args.lock, args.tableId, args.startRow, args.endRow);
         return null;
@@ -3169,6 +3284,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTabletServerStatus_result getResult(I iface, getTabletServerStatus_args args) throws org.apache.thrift.TException {
         getTabletServerStatus_result result = new getTabletServerStatus_result();
         try {
@@ -3193,6 +3313,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTabletStats_result getResult(I iface, getTabletStats_args args) throws org.apache.thrift.TException {
         getTabletStats_result result = new getTabletStats_result();
         try {
@@ -3217,6 +3342,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getHistoricalStats_result getResult(I iface, getHistoricalStats_args args) throws org.apache.thrift.TException {
         getHistoricalStats_result result = new getHistoricalStats_result();
         try {
@@ -3241,6 +3371,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public halt_result getResult(I iface, halt_args args) throws org.apache.thrift.TException {
         halt_result result = new halt_result();
         try {
@@ -3265,6 +3400,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, fastHalt_args args) throws org.apache.thrift.TException {
         iface.fastHalt(args.tinfo, args.credentials, args.lock);
         return null;
@@ -3284,6 +3424,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveScans_result getResult(I iface, getActiveScans_args args) throws org.apache.thrift.TException {
         getActiveScans_result result = new getActiveScans_result();
         try {
@@ -3308,6 +3453,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveCompactions_result getResult(I iface, getActiveCompactions_args args) throws org.apache.thrift.TException {
         getActiveCompactions_result result = new getActiveCompactions_result();
         try {
@@ -3332,6 +3482,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, removeLogs_args args) throws org.apache.thrift.TException {
         iface.removeLogs(args.tinfo, args.credentials, args.filenames);
         return null;
@@ -3351,6 +3506,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveLogs_result getResult(I iface, getActiveLogs_args args) throws org.apache.thrift.TException {
         getActiveLogs_result result = new getActiveLogs_result();
         result.success = iface.getActiveLogs(args.tinfo, args.credentials);
@@ -3371,6 +3531,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startGetSummaries_result getResult(I iface, startGetSummaries_args args) throws org.apache.thrift.TException {
         startGetSummaries_result result = new startGetSummaries_result();
         try {
@@ -3397,6 +3562,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startGetSummariesForPartition_result getResult(I iface, startGetSummariesForPartition_args args) throws org.apache.thrift.TException {
         startGetSummariesForPartition_result result = new startGetSummariesForPartition_result();
         try {
@@ -3421,6 +3591,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public startGetSummariesFromFiles_result getResult(I iface, startGetSummariesFromFiles_args args) throws org.apache.thrift.TException {
         startGetSummariesFromFiles_result result = new startGetSummariesFromFiles_result();
         try {
@@ -3445,6 +3620,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public contiuneGetSummaries_result getResult(I iface, contiuneGetSummaries_args args) throws org.apache.thrift.TException {
         contiuneGetSummaries_result result = new contiuneGetSummaries_result();
         try {
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 8051bf450e..d84de80d13 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 ce5f1c50b5..ee12849e8c 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.tabletserver.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 4e904c4de4..874785a740 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.core.trace.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 d1893230b7..7326944cb1 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -26,7 +26,7 @@
 #   INCLUDED_MODULES should be an array that includes other Maven modules with src/main/thrift directories
 #   Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
 # ========================================================================================================================
-[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.10.0'
+[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.11.0'
 [[ -z $INCLUDED_MODULES ]]        && INCLUDED_MODULES=(../server/tracer)
 [[ -z $BASE_OUTPUT_PACKAGE ]]     && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
 [[ -z $PACKAGES_TO_GENERATE ]]    && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data replication trace)
@@ -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=undated,handle_runtime_exceptions "$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
@@ -73,10 +73,6 @@ done
 
 # For all generated thrift code, get rid of all warnings and add the LICENSE header
 
-# workaround for THRIFT-4062; should be fixed in newer thrift versions
-find $BUILD_DIR/gen-java -name '*.java' -exec sed -i -e 's/\(org[.]apache[.]\)thrift\([.]TServiceClient\) /\1accumulo.core.rpc\2Wrapper /' {} +
-# upstream stopped doing import statements for classes, but overlooked enums; delete unused imports
-find $BUILD_DIR/gen-java -name '*.java' -exec grep -Zl '^public enum ' {} + | xargs -0 sed -i -e '/^import .*$/d'
 # add dummy method to suppress "unnecessary suppress warnings" for classes which don't have any unused variables
 # this only affects classes, enums aren't affected
 find $BUILD_DIR/gen-java -name '*.java' -exec grep -Zl '^public class ' {} + | xargs -0 sed -i -e 's/^[}]$/  private static void unusedMethod() {}\
diff --git a/pom.xml b/pom.xml
index f17ab5fce3..cde58c7b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
     <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
     <surefire.groups />
     <!-- Thrift version -->
-    <thrift.version>0.10.0</thrift.version>
+    <thrift.version>0.11.0</thrift.version>
     <unitTestMemSize>-Xmx1G</unitTestMemSize>
     <!-- ZooKeeper version -->
     <zookeeper.version>3.4.10</zookeeper.version>
diff --git a/proxy/src/main/cpp/AccumuloProxy.cpp b/proxy/src/main/cpp/AccumuloProxy.cpp
index dbd45ddd0b..bdf09efa99 100644
--- a/proxy/src/main/cpp/AccumuloProxy.cpp
+++ b/proxy/src/main/cpp/AccumuloProxy.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,7 +31,7 @@ AccumuloProxy_login_args::~AccumuloProxy_login_args() throw() {
 
 uint32_t AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -95,7 +95,7 @@ uint32_t AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_args");
 
   xfer += oprot->writeFieldBegin("principal", ::apache::thrift::protocol::T_STRING, 1);
@@ -127,7 +127,7 @@ AccumuloProxy_login_pargs::~AccumuloProxy_login_pargs() throw() {
 
 uint32_t AccumuloProxy_login_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_pargs");
 
   xfer += oprot->writeFieldBegin("principal", ::apache::thrift::protocol::T_STRING, 1);
@@ -159,7 +159,7 @@ AccumuloProxy_login_result::~AccumuloProxy_login_result() throw() {
 
 uint32_t AccumuloProxy_login_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -233,7 +233,7 @@ AccumuloProxy_login_presult::~AccumuloProxy_login_presult() throw() {
 
 uint32_t AccumuloProxy_login_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -287,7 +287,7 @@ AccumuloProxy_addConstraint_args::~AccumuloProxy_addConstraint_args() throw() {
 
 uint32_t AccumuloProxy_addConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -344,7 +344,7 @@ uint32_t AccumuloProxy_addConstraint_args::read(::apache::thrift::protocol::TPro
 
 uint32_t AccumuloProxy_addConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -371,7 +371,7 @@ AccumuloProxy_addConstraint_pargs::~AccumuloProxy_addConstraint_pargs() throw()
 
 uint32_t AccumuloProxy_addConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -398,7 +398,7 @@ AccumuloProxy_addConstraint_result::~AccumuloProxy_addConstraint_result() throw(
 
 uint32_t AccumuloProxy_addConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -496,7 +496,7 @@ AccumuloProxy_addConstraint_presult::~AccumuloProxy_addConstraint_presult() thro
 
 uint32_t AccumuloProxy_addConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -566,7 +566,7 @@ AccumuloProxy_addSplits_args::~AccumuloProxy_addSplits_args() throw() {
 
 uint32_t AccumuloProxy_addSplits_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -636,7 +636,7 @@ uint32_t AccumuloProxy_addSplits_args::read(::apache::thrift::protocol::TProtoco
 
 uint32_t AccumuloProxy_addSplits_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addSplits_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -671,7 +671,7 @@ AccumuloProxy_addSplits_pargs::~AccumuloProxy_addSplits_pargs() throw() {
 
 uint32_t AccumuloProxy_addSplits_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addSplits_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -706,7 +706,7 @@ AccumuloProxy_addSplits_result::~AccumuloProxy_addSplits_result() throw() {
 
 uint32_t AccumuloProxy_addSplits_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -792,7 +792,7 @@ AccumuloProxy_addSplits_presult::~AccumuloProxy_addSplits_presult() throw() {
 
 uint32_t AccumuloProxy_addSplits_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -854,7 +854,7 @@ AccumuloProxy_attachIterator_args::~AccumuloProxy_attachIterator_args() throw()
 
 uint32_t AccumuloProxy_attachIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -934,7 +934,7 @@ uint32_t AccumuloProxy_attachIterator_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_attachIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -973,7 +973,7 @@ AccumuloProxy_attachIterator_pargs::~AccumuloProxy_attachIterator_pargs() throw(
 
 uint32_t AccumuloProxy_attachIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1012,7 +1012,7 @@ AccumuloProxy_attachIterator_result::~AccumuloProxy_attachIterator_result() thro
 
 uint32_t AccumuloProxy_attachIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1098,7 +1098,7 @@ AccumuloProxy_attachIterator_presult::~AccumuloProxy_attachIterator_presult() th
 
 uint32_t AccumuloProxy_attachIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1160,7 +1160,7 @@ AccumuloProxy_checkIteratorConflicts_args::~AccumuloProxy_checkIteratorConflicts
 
 uint32_t AccumuloProxy_checkIteratorConflicts_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1240,7 +1240,7 @@ uint32_t AccumuloProxy_checkIteratorConflicts_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_checkIteratorConflicts_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkIteratorConflicts_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1279,7 +1279,7 @@ AccumuloProxy_checkIteratorConflicts_pargs::~AccumuloProxy_checkIteratorConflict
 
 uint32_t AccumuloProxy_checkIteratorConflicts_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkIteratorConflicts_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1318,7 +1318,7 @@ AccumuloProxy_checkIteratorConflicts_result::~AccumuloProxy_checkIteratorConflic
 
 uint32_t AccumuloProxy_checkIteratorConflicts_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1404,7 +1404,7 @@ AccumuloProxy_checkIteratorConflicts_presult::~AccumuloProxy_checkIteratorConfli
 
 uint32_t AccumuloProxy_checkIteratorConflicts_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1466,7 +1466,7 @@ AccumuloProxy_clearLocatorCache_args::~AccumuloProxy_clearLocatorCache_args() th
 
 uint32_t AccumuloProxy_clearLocatorCache_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1515,7 +1515,7 @@ uint32_t AccumuloProxy_clearLocatorCache_args::read(::apache::thrift::protocol::
 
 uint32_t AccumuloProxy_clearLocatorCache_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_clearLocatorCache_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1538,7 +1538,7 @@ AccumuloProxy_clearLocatorCache_pargs::~AccumuloProxy_clearLocatorCache_pargs()
 
 uint32_t AccumuloProxy_clearLocatorCache_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_clearLocatorCache_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1561,7 +1561,7 @@ AccumuloProxy_clearLocatorCache_result::~AccumuloProxy_clearLocatorCache_result(
 
 uint32_t AccumuloProxy_clearLocatorCache_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1623,7 +1623,7 @@ AccumuloProxy_clearLocatorCache_presult::~AccumuloProxy_clearLocatorCache_presul
 
 uint32_t AccumuloProxy_clearLocatorCache_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1669,7 +1669,7 @@ AccumuloProxy_cloneTable_args::~AccumuloProxy_cloneTable_args() throw() {
 
 uint32_t AccumuloProxy_cloneTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1778,7 +1778,7 @@ uint32_t AccumuloProxy_cloneTable_args::read(::apache::thrift::protocol::TProtoc
 
 uint32_t AccumuloProxy_cloneTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cloneTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1834,7 +1834,7 @@ AccumuloProxy_cloneTable_pargs::~AccumuloProxy_cloneTable_pargs() throw() {
 
 uint32_t AccumuloProxy_cloneTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cloneTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1890,7 +1890,7 @@ AccumuloProxy_cloneTable_result::~AccumuloProxy_cloneTable_result() throw() {
 
 uint32_t AccumuloProxy_cloneTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1988,7 +1988,7 @@ AccumuloProxy_cloneTable_presult::~AccumuloProxy_cloneTable_presult() throw() {
 
 uint32_t AccumuloProxy_cloneTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2058,7 +2058,7 @@ AccumuloProxy_compactTable_args::~AccumuloProxy_compactTable_args() throw() {
 
 uint32_t AccumuloProxy_compactTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2167,7 +2167,7 @@ uint32_t AccumuloProxy_compactTable_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_compactTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_compactTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2222,7 +2222,7 @@ AccumuloProxy_compactTable_pargs::~AccumuloProxy_compactTable_pargs() throw() {
 
 uint32_t AccumuloProxy_compactTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_compactTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2277,7 +2277,7 @@ AccumuloProxy_compactTable_result::~AccumuloProxy_compactTable_result() throw()
 
 uint32_t AccumuloProxy_compactTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2363,7 +2363,7 @@ AccumuloProxy_compactTable_presult::~AccumuloProxy_compactTable_presult() throw(
 
 uint32_t AccumuloProxy_compactTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2425,7 +2425,7 @@ AccumuloProxy_cancelCompaction_args::~AccumuloProxy_cancelCompaction_args() thro
 
 uint32_t AccumuloProxy_cancelCompaction_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2474,7 +2474,7 @@ uint32_t AccumuloProxy_cancelCompaction_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_cancelCompaction_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cancelCompaction_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2497,7 +2497,7 @@ AccumuloProxy_cancelCompaction_pargs::~AccumuloProxy_cancelCompaction_pargs() th
 
 uint32_t AccumuloProxy_cancelCompaction_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cancelCompaction_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2520,7 +2520,7 @@ AccumuloProxy_cancelCompaction_result::~AccumuloProxy_cancelCompaction_result()
 
 uint32_t AccumuloProxy_cancelCompaction_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2606,7 +2606,7 @@ AccumuloProxy_cancelCompaction_presult::~AccumuloProxy_cancelCompaction_presult(
 
 uint32_t AccumuloProxy_cancelCompaction_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2668,7 +2668,7 @@ AccumuloProxy_createTable_args::~AccumuloProxy_createTable_args() throw() {
 
 uint32_t AccumuloProxy_createTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2735,7 +2735,7 @@ uint32_t AccumuloProxy_createTable_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_createTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2766,7 +2766,7 @@ AccumuloProxy_createTable_pargs::~AccumuloProxy_createTable_pargs() throw() {
 
 uint32_t AccumuloProxy_createTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2797,7 +2797,7 @@ AccumuloProxy_createTable_result::~AccumuloProxy_createTable_result() throw() {
 
 uint32_t AccumuloProxy_createTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2883,7 +2883,7 @@ AccumuloProxy_createTable_presult::~AccumuloProxy_createTable_presult() throw()
 
 uint32_t AccumuloProxy_createTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2945,7 +2945,7 @@ AccumuloProxy_deleteTable_args::~AccumuloProxy_deleteTable_args() throw() {
 
 uint32_t AccumuloProxy_deleteTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2994,7 +2994,7 @@ uint32_t AccumuloProxy_deleteTable_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_deleteTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3017,7 +3017,7 @@ AccumuloProxy_deleteTable_pargs::~AccumuloProxy_deleteTable_pargs() throw() {
 
 uint32_t AccumuloProxy_deleteTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3040,7 +3040,7 @@ AccumuloProxy_deleteTable_result::~AccumuloProxy_deleteTable_result() throw() {
 
 uint32_t AccumuloProxy_deleteTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3126,7 +3126,7 @@ AccumuloProxy_deleteTable_presult::~AccumuloProxy_deleteTable_presult() throw()
 
 uint32_t AccumuloProxy_deleteTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3188,7 +3188,7 @@ AccumuloProxy_deleteRows_args::~AccumuloProxy_deleteRows_args() throw() {
 
 uint32_t AccumuloProxy_deleteRows_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3253,7 +3253,7 @@ uint32_t AccumuloProxy_deleteRows_args::read(::apache::thrift::protocol::TProtoc
 
 uint32_t AccumuloProxy_deleteRows_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteRows_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3284,7 +3284,7 @@ AccumuloProxy_deleteRows_pargs::~AccumuloProxy_deleteRows_pargs() throw() {
 
 uint32_t AccumuloProxy_deleteRows_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteRows_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3315,7 +3315,7 @@ AccumuloProxy_deleteRows_result::~AccumuloProxy_deleteRows_result() throw() {
 
 uint32_t AccumuloProxy_deleteRows_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3401,7 +3401,7 @@ AccumuloProxy_deleteRows_presult::~AccumuloProxy_deleteRows_presult() throw() {
 
 uint32_t AccumuloProxy_deleteRows_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3463,7 +3463,7 @@ AccumuloProxy_exportTable_args::~AccumuloProxy_exportTable_args() throw() {
 
 uint32_t AccumuloProxy_exportTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3520,7 +3520,7 @@ uint32_t AccumuloProxy_exportTable_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_exportTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_exportTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3547,7 +3547,7 @@ AccumuloProxy_exportTable_pargs::~AccumuloProxy_exportTable_pargs() throw() {
 
 uint32_t AccumuloProxy_exportTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_exportTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3574,7 +3574,7 @@ AccumuloProxy_exportTable_result::~AccumuloProxy_exportTable_result() throw() {
 
 uint32_t AccumuloProxy_exportTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3660,7 +3660,7 @@ AccumuloProxy_exportTable_presult::~AccumuloProxy_exportTable_presult() throw()
 
 uint32_t AccumuloProxy_exportTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3722,7 +3722,7 @@ AccumuloProxy_flushTable_args::~AccumuloProxy_flushTable_args() throw() {
 
 uint32_t AccumuloProxy_flushTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3795,7 +3795,7 @@ uint32_t AccumuloProxy_flushTable_args::read(::apache::thrift::protocol::TProtoc
 
 uint32_t AccumuloProxy_flushTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flushTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3830,7 +3830,7 @@ AccumuloProxy_flushTable_pargs::~AccumuloProxy_flushTable_pargs() throw() {
 
 uint32_t AccumuloProxy_flushTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flushTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3865,7 +3865,7 @@ AccumuloProxy_flushTable_result::~AccumuloProxy_flushTable_result() throw() {
 
 uint32_t AccumuloProxy_flushTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3951,7 +3951,7 @@ AccumuloProxy_flushTable_presult::~AccumuloProxy_flushTable_presult() throw() {
 
 uint32_t AccumuloProxy_flushTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4013,7 +4013,7 @@ AccumuloProxy_getDiskUsage_args::~AccumuloProxy_getDiskUsage_args() throw() {
 
 uint32_t AccumuloProxy_getDiskUsage_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4075,7 +4075,7 @@ uint32_t AccumuloProxy_getDiskUsage_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_getDiskUsage_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getDiskUsage_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4106,7 +4106,7 @@ AccumuloProxy_getDiskUsage_pargs::~AccumuloProxy_getDiskUsage_pargs() throw() {
 
 uint32_t AccumuloProxy_getDiskUsage_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getDiskUsage_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4137,7 +4137,7 @@ AccumuloProxy_getDiskUsage_result::~AccumuloProxy_getDiskUsage_result() throw()
 
 uint32_t AccumuloProxy_getDiskUsage_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4255,7 +4255,7 @@ AccumuloProxy_getDiskUsage_presult::~AccumuloProxy_getDiskUsage_presult() throw(
 
 uint32_t AccumuloProxy_getDiskUsage_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4337,7 +4337,7 @@ AccumuloProxy_getLocalityGroups_args::~AccumuloProxy_getLocalityGroups_args() th
 
 uint32_t AccumuloProxy_getLocalityGroups_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4386,7 +4386,7 @@ uint32_t AccumuloProxy_getLocalityGroups_args::read(::apache::thrift::protocol::
 
 uint32_t AccumuloProxy_getLocalityGroups_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getLocalityGroups_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4409,7 +4409,7 @@ AccumuloProxy_getLocalityGroups_pargs::~AccumuloProxy_getLocalityGroups_pargs()
 
 uint32_t AccumuloProxy_getLocalityGroups_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getLocalityGroups_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4432,7 +4432,7 @@ AccumuloProxy_getLocalityGroups_result::~AccumuloProxy_getLocalityGroups_result(
 
 uint32_t AccumuloProxy_getLocalityGroups_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4575,7 +4575,7 @@ AccumuloProxy_getLocalityGroups_presult::~AccumuloProxy_getLocalityGroups_presul
 
 uint32_t AccumuloProxy_getLocalityGroups_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4673,7 +4673,7 @@ AccumuloProxy_getIteratorSetting_args::~AccumuloProxy_getIteratorSetting_args()
 
 uint32_t AccumuloProxy_getIteratorSetting_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4740,7 +4740,7 @@ uint32_t AccumuloProxy_getIteratorSetting_args::read(::apache::thrift::protocol:
 
 uint32_t AccumuloProxy_getIteratorSetting_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getIteratorSetting_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4771,7 +4771,7 @@ AccumuloProxy_getIteratorSetting_pargs::~AccumuloProxy_getIteratorSetting_pargs(
 
 uint32_t AccumuloProxy_getIteratorSetting_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getIteratorSetting_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4802,7 +4802,7 @@ AccumuloProxy_getIteratorSetting_result::~AccumuloProxy_getIteratorSetting_resul
 
 uint32_t AccumuloProxy_getIteratorSetting_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4900,7 +4900,7 @@ AccumuloProxy_getIteratorSetting_presult::~AccumuloProxy_getIteratorSetting_pres
 
 uint32_t AccumuloProxy_getIteratorSetting_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4970,7 +4970,7 @@ AccumuloProxy_getMaxRow_args::~AccumuloProxy_getMaxRow_args() throw() {
 
 uint32_t AccumuloProxy_getMaxRow_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5072,7 +5072,7 @@ uint32_t AccumuloProxy_getMaxRow_args::read(::apache::thrift::protocol::TProtoco
 
 uint32_t AccumuloProxy_getMaxRow_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getMaxRow_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5123,7 +5123,7 @@ AccumuloProxy_getMaxRow_pargs::~AccumuloProxy_getMaxRow_pargs() throw() {
 
 uint32_t AccumuloProxy_getMaxRow_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getMaxRow_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5174,7 +5174,7 @@ AccumuloProxy_getMaxRow_result::~AccumuloProxy_getMaxRow_result() throw() {
 
 uint32_t AccumuloProxy_getMaxRow_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5272,7 +5272,7 @@ AccumuloProxy_getMaxRow_presult::~AccumuloProxy_getMaxRow_presult() throw() {
 
 uint32_t AccumuloProxy_getMaxRow_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5342,7 +5342,7 @@ AccumuloProxy_getTableProperties_args::~AccumuloProxy_getTableProperties_args()
 
 uint32_t AccumuloProxy_getTableProperties_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5391,7 +5391,7 @@ uint32_t AccumuloProxy_getTableProperties_args::read(::apache::thrift::protocol:
 
 uint32_t AccumuloProxy_getTableProperties_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTableProperties_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5414,7 +5414,7 @@ AccumuloProxy_getTableProperties_pargs::~AccumuloProxy_getTableProperties_pargs(
 
 uint32_t AccumuloProxy_getTableProperties_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTableProperties_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5437,7 +5437,7 @@ AccumuloProxy_getTableProperties_result::~AccumuloProxy_getTableProperties_resul
 
 uint32_t AccumuloProxy_getTableProperties_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5559,7 +5559,7 @@ AccumuloProxy_getTableProperties_presult::~AccumuloProxy_getTableProperties_pres
 
 uint32_t AccumuloProxy_getTableProperties_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5644,7 +5644,7 @@ AccumuloProxy_importDirectory_args::~AccumuloProxy_importDirectory_args() throw(
 
 uint32_t AccumuloProxy_importDirectory_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5717,7 +5717,7 @@ uint32_t AccumuloProxy_importDirectory_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_importDirectory_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importDirectory_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5752,7 +5752,7 @@ AccumuloProxy_importDirectory_pargs::~AccumuloProxy_importDirectory_pargs() thro
 
 uint32_t AccumuloProxy_importDirectory_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importDirectory_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5787,7 +5787,7 @@ AccumuloProxy_importDirectory_result::~AccumuloProxy_importDirectory_result() th
 
 uint32_t AccumuloProxy_importDirectory_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5873,7 +5873,7 @@ AccumuloProxy_importDirectory_presult::~AccumuloProxy_importDirectory_presult()
 
 uint32_t AccumuloProxy_importDirectory_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5935,7 +5935,7 @@ AccumuloProxy_importTable_args::~AccumuloProxy_importTable_args() throw() {
 
 uint32_t AccumuloProxy_importTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5992,7 +5992,7 @@ uint32_t AccumuloProxy_importTable_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_importTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6019,7 +6019,7 @@ AccumuloProxy_importTable_pargs::~AccumuloProxy_importTable_pargs() throw() {
 
 uint32_t AccumuloProxy_importTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6046,7 +6046,7 @@ AccumuloProxy_importTable_result::~AccumuloProxy_importTable_result() throw() {
 
 uint32_t AccumuloProxy_importTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6132,7 +6132,7 @@ AccumuloProxy_importTable_presult::~AccumuloProxy_importTable_presult() throw()
 
 uint32_t AccumuloProxy_importTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6194,7 +6194,7 @@ AccumuloProxy_listSplits_args::~AccumuloProxy_listSplits_args() throw() {
 
 uint32_t AccumuloProxy_listSplits_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6251,7 +6251,7 @@ uint32_t AccumuloProxy_listSplits_args::read(::apache::thrift::protocol::TProtoc
 
 uint32_t AccumuloProxy_listSplits_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listSplits_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6278,7 +6278,7 @@ AccumuloProxy_listSplits_pargs::~AccumuloProxy_listSplits_pargs() throw() {
 
 uint32_t AccumuloProxy_listSplits_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listSplits_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6305,7 +6305,7 @@ AccumuloProxy_listSplits_result::~AccumuloProxy_listSplits_result() throw() {
 
 uint32_t AccumuloProxy_listSplits_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6423,7 +6423,7 @@ AccumuloProxy_listSplits_presult::~AccumuloProxy_listSplits_presult() throw() {
 
 uint32_t AccumuloProxy_listSplits_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6505,7 +6505,7 @@ AccumuloProxy_listTables_args::~AccumuloProxy_listTables_args() throw() {
 
 uint32_t AccumuloProxy_listTables_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6546,7 +6546,7 @@ uint32_t AccumuloProxy_listTables_args::read(::apache::thrift::protocol::TProtoc
 
 uint32_t AccumuloProxy_listTables_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listTables_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6565,7 +6565,7 @@ AccumuloProxy_listTables_pargs::~AccumuloProxy_listTables_pargs() throw() {
 
 uint32_t AccumuloProxy_listTables_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listTables_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6584,7 +6584,7 @@ AccumuloProxy_listTables_result::~AccumuloProxy_listTables_result() throw() {
 
 uint32_t AccumuloProxy_listTables_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6667,7 +6667,7 @@ AccumuloProxy_listTables_presult::~AccumuloProxy_listTables_presult() throw() {
 
 uint32_t AccumuloProxy_listTables_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6726,7 +6726,7 @@ AccumuloProxy_listIterators_args::~AccumuloProxy_listIterators_args() throw() {
 
 uint32_t AccumuloProxy_listIterators_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6775,7 +6775,7 @@ uint32_t AccumuloProxy_listIterators_args::read(::apache::thrift::protocol::TPro
 
 uint32_t AccumuloProxy_listIterators_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listIterators_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6798,7 +6798,7 @@ AccumuloProxy_listIterators_pargs::~AccumuloProxy_listIterators_pargs() throw()
 
 uint32_t AccumuloProxy_listIterators_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listIterators_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6821,7 +6821,7 @@ AccumuloProxy_listIterators_result::~AccumuloProxy_listIterators_result() throw(
 
 uint32_t AccumuloProxy_listIterators_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6966,7 +6966,7 @@ AccumuloProxy_listIterators_presult::~AccumuloProxy_listIterators_presult() thro
 
 uint32_t AccumuloProxy_listIterators_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7066,7 +7066,7 @@ AccumuloProxy_listConstraints_args::~AccumuloProxy_listConstraints_args() throw(
 
 uint32_t AccumuloProxy_listConstraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7115,7 +7115,7 @@ uint32_t AccumuloProxy_listConstraints_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_listConstraints_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listConstraints_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7138,7 +7138,7 @@ AccumuloProxy_listConstraints_pargs::~AccumuloProxy_listConstraints_pargs() thro
 
 uint32_t AccumuloProxy_listConstraints_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listConstraints_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7161,7 +7161,7 @@ AccumuloProxy_listConstraints_result::~AccumuloProxy_listConstraints_result() th
 
 uint32_t AccumuloProxy_listConstraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7283,7 +7283,7 @@ AccumuloProxy_listConstraints_presult::~AccumuloProxy_listConstraints_presult()
 
 uint32_t AccumuloProxy_listConstraints_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7368,7 +7368,7 @@ AccumuloProxy_mergeTablets_args::~AccumuloProxy_mergeTablets_args() throw() {
 
 uint32_t AccumuloProxy_mergeTablets_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7433,7 +7433,7 @@ uint32_t AccumuloProxy_mergeTablets_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_mergeTablets_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_mergeTablets_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7464,7 +7464,7 @@ AccumuloProxy_mergeTablets_pargs::~AccumuloProxy_mergeTablets_pargs() throw() {
 
 uint32_t AccumuloProxy_mergeTablets_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_mergeTablets_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7495,7 +7495,7 @@ AccumuloProxy_mergeTablets_result::~AccumuloProxy_mergeTablets_result() throw()
 
 uint32_t AccumuloProxy_mergeTablets_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7581,7 +7581,7 @@ AccumuloProxy_mergeTablets_presult::~AccumuloProxy_mergeTablets_presult() throw(
 
 uint32_t AccumuloProxy_mergeTablets_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7643,7 +7643,7 @@ AccumuloProxy_offlineTable_args::~AccumuloProxy_offlineTable_args() throw() {
 
 uint32_t AccumuloProxy_offlineTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7700,7 +7700,7 @@ uint32_t AccumuloProxy_offlineTable_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_offlineTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_offlineTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7727,7 +7727,7 @@ AccumuloProxy_offlineTable_pargs::~AccumuloProxy_offlineTable_pargs() throw() {
 
 uint32_t AccumuloProxy_offlineTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_offlineTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7754,7 +7754,7 @@ AccumuloProxy_offlineTable_result::~AccumuloProxy_offlineTable_result() throw()
 
 uint32_t AccumuloProxy_offlineTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7840,7 +7840,7 @@ AccumuloProxy_offlineTable_presult::~AccumuloProxy_offlineTable_presult() throw(
 
 uint32_t AccumuloProxy_offlineTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7902,7 +7902,7 @@ AccumuloProxy_onlineTable_args::~AccumuloProxy_onlineTable_args() throw() {
 
 uint32_t AccumuloProxy_onlineTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7959,7 +7959,7 @@ uint32_t AccumuloProxy_onlineTable_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_onlineTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_onlineTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7986,7 +7986,7 @@ AccumuloProxy_onlineTable_pargs::~AccumuloProxy_onlineTable_pargs() throw() {
 
 uint32_t AccumuloProxy_onlineTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_onlineTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8013,7 +8013,7 @@ AccumuloProxy_onlineTable_result::~AccumuloProxy_onlineTable_result() throw() {
 
 uint32_t AccumuloProxy_onlineTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8099,7 +8099,7 @@ AccumuloProxy_onlineTable_presult::~AccumuloProxy_onlineTable_presult() throw()
 
 uint32_t AccumuloProxy_onlineTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8161,7 +8161,7 @@ AccumuloProxy_removeConstraint_args::~AccumuloProxy_removeConstraint_args() thro
 
 uint32_t AccumuloProxy_removeConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8218,7 +8218,7 @@ uint32_t AccumuloProxy_removeConstraint_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_removeConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8245,7 +8245,7 @@ AccumuloProxy_removeConstraint_pargs::~AccumuloProxy_removeConstraint_pargs() th
 
 uint32_t AccumuloProxy_removeConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8272,7 +8272,7 @@ AccumuloProxy_removeConstraint_result::~AccumuloProxy_removeConstraint_result()
 
 uint32_t AccumuloProxy_removeConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8358,7 +8358,7 @@ AccumuloProxy_removeConstraint_presult::~AccumuloProxy_removeConstraint_presult(
 
 uint32_t AccumuloProxy_removeConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8420,7 +8420,7 @@ AccumuloProxy_removeIterator_args::~AccumuloProxy_removeIterator_args() throw()
 
 uint32_t AccumuloProxy_removeIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8500,7 +8500,7 @@ uint32_t AccumuloProxy_removeIterator_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_removeIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8539,7 +8539,7 @@ AccumuloProxy_removeIterator_pargs::~AccumuloProxy_removeIterator_pargs() throw(
 
 uint32_t AccumuloProxy_removeIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8578,7 +8578,7 @@ AccumuloProxy_removeIterator_result::~AccumuloProxy_removeIterator_result() thro
 
 uint32_t AccumuloProxy_removeIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8664,7 +8664,7 @@ AccumuloProxy_removeIterator_presult::~AccumuloProxy_removeIterator_presult() th
 
 uint32_t AccumuloProxy_removeIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8726,7 +8726,7 @@ AccumuloProxy_removeTableProperty_args::~AccumuloProxy_removeTableProperty_args(
 
 uint32_t AccumuloProxy_removeTableProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8783,7 +8783,7 @@ uint32_t AccumuloProxy_removeTableProperty_args::read(::apache::thrift::protocol
 
 uint32_t AccumuloProxy_removeTableProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeTableProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8810,7 +8810,7 @@ AccumuloProxy_removeTableProperty_pargs::~AccumuloProxy_removeTableProperty_parg
 
 uint32_t AccumuloProxy_removeTableProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeTableProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8837,7 +8837,7 @@ AccumuloProxy_removeTableProperty_result::~AccumuloProxy_removeTableProperty_res
 
 uint32_t AccumuloProxy_removeTableProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8923,7 +8923,7 @@ AccumuloProxy_removeTableProperty_presult::~AccumuloProxy_removeTableProperty_pr
 
 uint32_t AccumuloProxy_removeTableProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8985,7 +8985,7 @@ AccumuloProxy_renameTable_args::~AccumuloProxy_renameTable_args() throw() {
 
 uint32_t AccumuloProxy_renameTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9042,7 +9042,7 @@ uint32_t AccumuloProxy_renameTable_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_renameTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9069,7 +9069,7 @@ AccumuloProxy_renameTable_pargs::~AccumuloProxy_renameTable_pargs() throw() {
 
 uint32_t AccumuloProxy_renameTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9096,7 +9096,7 @@ AccumuloProxy_renameTable_result::~AccumuloProxy_renameTable_result() throw() {
 
 uint32_t AccumuloProxy_renameTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9194,7 +9194,7 @@ AccumuloProxy_renameTable_presult::~AccumuloProxy_renameTable_presult() throw()
 
 uint32_t AccumuloProxy_renameTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9264,7 +9264,7 @@ AccumuloProxy_setLocalityGroups_args::~AccumuloProxy_setLocalityGroups_args() th
 
 uint32_t AccumuloProxy_setLocalityGroups_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9349,7 +9349,7 @@ uint32_t AccumuloProxy_setLocalityGroups_args::read(::apache::thrift::protocol::
 
 uint32_t AccumuloProxy_setLocalityGroups_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setLocalityGroups_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9393,7 +9393,7 @@ AccumuloProxy_setLocalityGroups_pargs::~AccumuloProxy_setLocalityGroups_pargs()
 
 uint32_t AccumuloProxy_setLocalityGroups_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setLocalityGroups_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9437,7 +9437,7 @@ AccumuloProxy_setLocalityGroups_result::~AccumuloProxy_setLocalityGroups_result(
 
 uint32_t AccumuloProxy_setLocalityGroups_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9523,7 +9523,7 @@ AccumuloProxy_setLocalityGroups_presult::~AccumuloProxy_setLocalityGroups_presul
 
 uint32_t AccumuloProxy_setLocalityGroups_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9585,7 +9585,7 @@ AccumuloProxy_setTableProperty_args::~AccumuloProxy_setTableProperty_args() thro
 
 uint32_t AccumuloProxy_setTableProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9650,7 +9650,7 @@ uint32_t AccumuloProxy_setTableProperty_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_setTableProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setTableProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9681,7 +9681,7 @@ AccumuloProxy_setTableProperty_pargs::~AccumuloProxy_setTableProperty_pargs() th
 
 uint32_t AccumuloProxy_setTableProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setTableProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9712,7 +9712,7 @@ AccumuloProxy_setTableProperty_result::~AccumuloProxy_setTableProperty_result()
 
 uint32_t AccumuloProxy_setTableProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9798,7 +9798,7 @@ AccumuloProxy_setTableProperty_presult::~AccumuloProxy_setTableProperty_presult(
 
 uint32_t AccumuloProxy_setTableProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9860,7 +9860,7 @@ AccumuloProxy_splitRangeByTablets_args::~AccumuloProxy_splitRangeByTablets_args(
 
 uint32_t AccumuloProxy_splitRangeByTablets_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9925,7 +9925,7 @@ uint32_t AccumuloProxy_splitRangeByTablets_args::read(::apache::thrift::protocol
 
 uint32_t AccumuloProxy_splitRangeByTablets_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_splitRangeByTablets_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9956,7 +9956,7 @@ AccumuloProxy_splitRangeByTablets_pargs::~AccumuloProxy_splitRangeByTablets_parg
 
 uint32_t AccumuloProxy_splitRangeByTablets_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_splitRangeByTablets_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9987,7 +9987,7 @@ AccumuloProxy_splitRangeByTablets_result::~AccumuloProxy_splitRangeByTablets_res
 
 uint32_t AccumuloProxy_splitRangeByTablets_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10106,7 +10106,7 @@ AccumuloProxy_splitRangeByTablets_presult::~AccumuloProxy_splitRangeByTablets_pr
 
 uint32_t AccumuloProxy_splitRangeByTablets_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10189,7 +10189,7 @@ AccumuloProxy_tableExists_args::~AccumuloProxy_tableExists_args() throw() {
 
 uint32_t AccumuloProxy_tableExists_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10238,7 +10238,7 @@ uint32_t AccumuloProxy_tableExists_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_tableExists_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableExists_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10261,7 +10261,7 @@ AccumuloProxy_tableExists_pargs::~AccumuloProxy_tableExists_pargs() throw() {
 
 uint32_t AccumuloProxy_tableExists_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableExists_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10284,7 +10284,7 @@ AccumuloProxy_tableExists_result::~AccumuloProxy_tableExists_result() throw() {
 
 uint32_t AccumuloProxy_tableExists_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10346,7 +10346,7 @@ AccumuloProxy_tableExists_presult::~AccumuloProxy_tableExists_presult() throw()
 
 uint32_t AccumuloProxy_tableExists_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10392,7 +10392,7 @@ AccumuloProxy_tableIdMap_args::~AccumuloProxy_tableIdMap_args() throw() {
 
 uint32_t AccumuloProxy_tableIdMap_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10433,7 +10433,7 @@ uint32_t AccumuloProxy_tableIdMap_args::read(::apache::thrift::protocol::TProtoc
 
 uint32_t AccumuloProxy_tableIdMap_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableIdMap_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10452,7 +10452,7 @@ AccumuloProxy_tableIdMap_pargs::~AccumuloProxy_tableIdMap_pargs() throw() {
 
 uint32_t AccumuloProxy_tableIdMap_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableIdMap_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10471,7 +10471,7 @@ AccumuloProxy_tableIdMap_result::~AccumuloProxy_tableIdMap_result() throw() {
 
 uint32_t AccumuloProxy_tableIdMap_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10557,7 +10557,7 @@ AccumuloProxy_tableIdMap_presult::~AccumuloProxy_tableIdMap_presult() throw() {
 
 uint32_t AccumuloProxy_tableIdMap_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10618,7 +10618,7 @@ AccumuloProxy_testTableClassLoad_args::~AccumuloProxy_testTableClassLoad_args()
 
 uint32_t AccumuloProxy_testTableClassLoad_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10683,7 +10683,7 @@ uint32_t AccumuloProxy_testTableClassLoad_args::read(::apache::thrift::protocol:
 
 uint32_t AccumuloProxy_testTableClassLoad_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testTableClassLoad_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10714,7 +10714,7 @@ AccumuloProxy_testTableClassLoad_pargs::~AccumuloProxy_testTableClassLoad_pargs(
 
 uint32_t AccumuloProxy_testTableClassLoad_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testTableClassLoad_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10745,7 +10745,7 @@ AccumuloProxy_testTableClassLoad_result::~AccumuloProxy_testTableClassLoad_resul
 
 uint32_t AccumuloProxy_testTableClassLoad_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10843,7 +10843,7 @@ AccumuloProxy_testTableClassLoad_presult::~AccumuloProxy_testTableClassLoad_pres
 
 uint32_t AccumuloProxy_testTableClassLoad_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10913,7 +10913,7 @@ AccumuloProxy_pingTabletServer_args::~AccumuloProxy_pingTabletServer_args() thro
 
 uint32_t AccumuloProxy_pingTabletServer_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10962,7 +10962,7 @@ uint32_t AccumuloProxy_pingTabletServer_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_pingTabletServer_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_pingTabletServer_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10985,7 +10985,7 @@ AccumuloProxy_pingTabletServer_pargs::~AccumuloProxy_pingTabletServer_pargs() th
 
 uint32_t AccumuloProxy_pingTabletServer_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_pingTabletServer_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11008,7 +11008,7 @@ AccumuloProxy_pingTabletServer_result::~AccumuloProxy_pingTabletServer_result()
 
 uint32_t AccumuloProxy_pingTabletServer_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11082,7 +11082,7 @@ AccumuloProxy_pingTabletServer_presult::~AccumuloProxy_pingTabletServer_presult(
 
 uint32_t AccumuloProxy_pingTabletServer_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11136,7 +11136,7 @@ AccumuloProxy_getActiveScans_args::~AccumuloProxy_getActiveScans_args() throw()
 
 uint32_t AccumuloProxy_getActiveScans_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11185,7 +11185,7 @@ uint32_t AccumuloProxy_getActiveScans_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_getActiveScans_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveScans_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11208,7 +11208,7 @@ AccumuloProxy_getActiveScans_pargs::~AccumuloProxy_getActiveScans_pargs() throw(
 
 uint32_t AccumuloProxy_getActiveScans_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveScans_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11231,7 +11231,7 @@ AccumuloProxy_getActiveScans_result::~AccumuloProxy_getActiveScans_result() thro
 
 uint32_t AccumuloProxy_getActiveScans_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11337,7 +11337,7 @@ AccumuloProxy_getActiveScans_presult::~AccumuloProxy_getActiveScans_presult() th
 
 uint32_t AccumuloProxy_getActiveScans_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11411,7 +11411,7 @@ AccumuloProxy_getActiveCompactions_args::~AccumuloProxy_getActiveCompactions_arg
 
 uint32_t AccumuloProxy_getActiveCompactions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11460,7 +11460,7 @@ uint32_t AccumuloProxy_getActiveCompactions_args::read(::apache::thrift::protoco
 
 uint32_t AccumuloProxy_getActiveCompactions_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveCompactions_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11483,7 +11483,7 @@ AccumuloProxy_getActiveCompactions_pargs::~AccumuloProxy_getActiveCompactions_pa
 
 uint32_t AccumuloProxy_getActiveCompactions_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveCompactions_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11506,7 +11506,7 @@ AccumuloProxy_getActiveCompactions_result::~AccumuloProxy_getActiveCompactions_r
 
 uint32_t AccumuloProxy_getActiveCompactions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11612,7 +11612,7 @@ AccumuloProxy_getActiveCompactions_presult::~AccumuloProxy_getActiveCompactions_
 
 uint32_t AccumuloProxy_getActiveCompactions_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11686,7 +11686,7 @@ AccumuloProxy_getSiteConfiguration_args::~AccumuloProxy_getSiteConfiguration_arg
 
 uint32_t AccumuloProxy_getSiteConfiguration_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11727,7 +11727,7 @@ uint32_t AccumuloProxy_getSiteConfiguration_args::read(::apache::thrift::protoco
 
 uint32_t AccumuloProxy_getSiteConfiguration_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSiteConfiguration_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11746,7 +11746,7 @@ AccumuloProxy_getSiteConfiguration_pargs::~AccumuloProxy_getSiteConfiguration_pa
 
 uint32_t AccumuloProxy_getSiteConfiguration_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSiteConfiguration_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11765,7 +11765,7 @@ AccumuloProxy_getSiteConfiguration_result::~AccumuloProxy_getSiteConfiguration_r
 
 uint32_t AccumuloProxy_getSiteConfiguration_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11875,7 +11875,7 @@ AccumuloProxy_getSiteConfiguration_presult::~AccumuloProxy_getSiteConfiguration_
 
 uint32_t AccumuloProxy_getSiteConfiguration_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11952,7 +11952,7 @@ AccumuloProxy_getSystemConfiguration_args::~AccumuloProxy_getSystemConfiguration
 
 uint32_t AccumuloProxy_getSystemConfiguration_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11993,7 +11993,7 @@ uint32_t AccumuloProxy_getSystemConfiguration_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_getSystemConfiguration_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSystemConfiguration_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12012,7 +12012,7 @@ AccumuloProxy_getSystemConfiguration_pargs::~AccumuloProxy_getSystemConfiguratio
 
 uint32_t AccumuloProxy_getSystemConfiguration_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSystemConfiguration_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12031,7 +12031,7 @@ AccumuloProxy_getSystemConfiguration_result::~AccumuloProxy_getSystemConfigurati
 
 uint32_t AccumuloProxy_getSystemConfiguration_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12141,7 +12141,7 @@ AccumuloProxy_getSystemConfiguration_presult::~AccumuloProxy_getSystemConfigurat
 
 uint32_t AccumuloProxy_getSystemConfiguration_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12218,7 +12218,7 @@ AccumuloProxy_getTabletServers_args::~AccumuloProxy_getTabletServers_args() thro
 
 uint32_t AccumuloProxy_getTabletServers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12259,7 +12259,7 @@ uint32_t AccumuloProxy_getTabletServers_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_getTabletServers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTabletServers_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12278,7 +12278,7 @@ AccumuloProxy_getTabletServers_pargs::~AccumuloProxy_getTabletServers_pargs() th
 
 uint32_t AccumuloProxy_getTabletServers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTabletServers_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12297,7 +12297,7 @@ AccumuloProxy_getTabletServers_result::~AccumuloProxy_getTabletServers_result()
 
 uint32_t AccumuloProxy_getTabletServers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12379,7 +12379,7 @@ AccumuloProxy_getTabletServers_presult::~AccumuloProxy_getTabletServers_presult(
 
 uint32_t AccumuloProxy_getTabletServers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12437,7 +12437,7 @@ AccumuloProxy_removeProperty_args::~AccumuloProxy_removeProperty_args() throw()
 
 uint32_t AccumuloProxy_removeProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12486,7 +12486,7 @@ uint32_t AccumuloProxy_removeProperty_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_removeProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12509,7 +12509,7 @@ AccumuloProxy_removeProperty_pargs::~AccumuloProxy_removeProperty_pargs() throw(
 
 uint32_t AccumuloProxy_removeProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12532,7 +12532,7 @@ AccumuloProxy_removeProperty_result::~AccumuloProxy_removeProperty_result() thro
 
 uint32_t AccumuloProxy_removeProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12606,7 +12606,7 @@ AccumuloProxy_removeProperty_presult::~AccumuloProxy_removeProperty_presult() th
 
 uint32_t AccumuloProxy_removeProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12660,7 +12660,7 @@ AccumuloProxy_setProperty_args::~AccumuloProxy_setProperty_args() throw() {
 
 uint32_t AccumuloProxy_setProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12717,7 +12717,7 @@ uint32_t AccumuloProxy_setProperty_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_setProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12744,7 +12744,7 @@ AccumuloProxy_setProperty_pargs::~AccumuloProxy_setProperty_pargs() throw() {
 
 uint32_t AccumuloProxy_setProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12771,7 +12771,7 @@ AccumuloProxy_setProperty_result::~AccumuloProxy_setProperty_result() throw() {
 
 uint32_t AccumuloProxy_setProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12845,7 +12845,7 @@ AccumuloProxy_setProperty_presult::~AccumuloProxy_setProperty_presult() throw()
 
 uint32_t AccumuloProxy_setProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12899,7 +12899,7 @@ AccumuloProxy_testClassLoad_args::~AccumuloProxy_testClassLoad_args() throw() {
 
 uint32_t AccumuloProxy_testClassLoad_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12956,7 +12956,7 @@ uint32_t AccumuloProxy_testClassLoad_args::read(::apache::thrift::protocol::TPro
 
 uint32_t AccumuloProxy_testClassLoad_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testClassLoad_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12983,7 +12983,7 @@ AccumuloProxy_testClassLoad_pargs::~AccumuloProxy_testClassLoad_pargs() throw()
 
 uint32_t AccumuloProxy_testClassLoad_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testClassLoad_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13010,7 +13010,7 @@ AccumuloProxy_testClassLoad_result::~AccumuloProxy_testClassLoad_result() throw(
 
 uint32_t AccumuloProxy_testClassLoad_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13096,7 +13096,7 @@ AccumuloProxy_testClassLoad_presult::~AccumuloProxy_testClassLoad_presult() thro
 
 uint32_t AccumuloProxy_testClassLoad_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13158,7 +13158,7 @@ AccumuloProxy_authenticateUser_args::~AccumuloProxy_authenticateUser_args() thro
 
 uint32_t AccumuloProxy_authenticateUser_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13230,7 +13230,7 @@ uint32_t AccumuloProxy_authenticateUser_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_authenticateUser_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_authenticateUser_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13266,7 +13266,7 @@ AccumuloProxy_authenticateUser_pargs::~AccumuloProxy_authenticateUser_pargs() th
 
 uint32_t AccumuloProxy_authenticateUser_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_authenticateUser_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13302,7 +13302,7 @@ AccumuloProxy_authenticateUser_result::~AccumuloProxy_authenticateUser_result()
 
 uint32_t AccumuloProxy_authenticateUser_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13388,7 +13388,7 @@ AccumuloProxy_authenticateUser_presult::~AccumuloProxy_authenticateUser_presult(
 
 uint32_t AccumuloProxy_authenticateUser_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13450,7 +13450,7 @@ AccumuloProxy_changeUserAuthorizations_args::~AccumuloProxy_changeUserAuthorizat
 
 uint32_t AccumuloProxy_changeUserAuthorizations_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13520,7 +13520,7 @@ uint32_t AccumuloProxy_changeUserAuthorizations_args::read(::apache::thrift::pro
 
 uint32_t AccumuloProxy_changeUserAuthorizations_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeUserAuthorizations_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13555,7 +13555,7 @@ AccumuloProxy_changeUserAuthorizations_pargs::~AccumuloProxy_changeUserAuthoriza
 
 uint32_t AccumuloProxy_changeUserAuthorizations_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeUserAuthorizations_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13590,7 +13590,7 @@ AccumuloProxy_changeUserAuthorizations_result::~AccumuloProxy_changeUserAuthoriz
 
 uint32_t AccumuloProxy_changeUserAuthorizations_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13664,7 +13664,7 @@ AccumuloProxy_changeUserAuthorizations_presult::~AccumuloProxy_changeUserAuthori
 
 uint32_t AccumuloProxy_changeUserAuthorizations_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13718,7 +13718,7 @@ AccumuloProxy_changeLocalUserPassword_args::~AccumuloProxy_changeLocalUserPasswo
 
 uint32_t AccumuloProxy_changeLocalUserPassword_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13775,7 +13775,7 @@ uint32_t AccumuloProxy_changeLocalUserPassword_args::read(::apache::thrift::prot
 
 uint32_t AccumuloProxy_changeLocalUserPassword_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeLocalUserPassword_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13802,7 +13802,7 @@ AccumuloProxy_changeLocalUserPassword_pargs::~AccumuloProxy_changeLocalUserPassw
 
 uint32_t AccumuloProxy_changeLocalUserPassword_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeLocalUserPassword_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13829,7 +13829,7 @@ AccumuloProxy_changeLocalUserPassword_result::~AccumuloProxy_changeLocalUserPass
 
 uint32_t AccumuloProxy_changeLocalUserPassword_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13903,7 +13903,7 @@ AccumuloProxy_changeLocalUserPassword_presult::~AccumuloProxy_changeLocalUserPas
 
 uint32_t AccumuloProxy_changeLocalUserPassword_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13957,7 +13957,7 @@ AccumuloProxy_createLocalUser_args::~AccumuloProxy_createLocalUser_args() throw(
 
 uint32_t AccumuloProxy_createLocalUser_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14014,7 +14014,7 @@ uint32_t AccumuloProxy_createLocalUser_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_createLocalUser_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createLocalUser_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14041,7 +14041,7 @@ AccumuloProxy_createLocalUser_pargs::~AccumuloProxy_createLocalUser_pargs() thro
 
 uint32_t AccumuloProxy_createLocalUser_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createLocalUser_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14068,7 +14068,7 @@ AccumuloProxy_createLocalUser_result::~AccumuloProxy_createLocalUser_result() th
 
 uint32_t AccumuloProxy_createLocalUser_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14142,7 +14142,7 @@ AccumuloProxy_createLocalUser_presult::~AccumuloProxy_createLocalUser_presult()
 
 uint32_t AccumuloProxy_createLocalUser_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14196,7 +14196,7 @@ AccumuloProxy_dropLocalUser_args::~AccumuloProxy_dropLocalUser_args() throw() {
 
 uint32_t AccumuloProxy_dropLocalUser_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14245,7 +14245,7 @@ uint32_t AccumuloProxy_dropLocalUser_args::read(::apache::thrift::protocol::TPro
 
 uint32_t AccumuloProxy_dropLocalUser_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_dropLocalUser_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14268,7 +14268,7 @@ AccumuloProxy_dropLocalUser_pargs::~AccumuloProxy_dropLocalUser_pargs() throw()
 
 uint32_t AccumuloProxy_dropLocalUser_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_dropLocalUser_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14291,7 +14291,7 @@ AccumuloProxy_dropLocalUser_result::~AccumuloProxy_dropLocalUser_result() throw(
 
 uint32_t AccumuloProxy_dropLocalUser_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14365,7 +14365,7 @@ AccumuloProxy_dropLocalUser_presult::~AccumuloProxy_dropLocalUser_presult() thro
 
 uint32_t AccumuloProxy_dropLocalUser_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14419,7 +14419,7 @@ AccumuloProxy_getUserAuthorizations_args::~AccumuloProxy_getUserAuthorizations_a
 
 uint32_t AccumuloProxy_getUserAuthorizations_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14468,7 +14468,7 @@ uint32_t AccumuloProxy_getUserAuthorizations_args::read(::apache::thrift::protoc
 
 uint32_t AccumuloProxy_getUserAuthorizations_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getUserAuthorizations_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14491,7 +14491,7 @@ AccumuloProxy_getUserAuthorizations_pargs::~AccumuloProxy_getUserAuthorizations_
 
 uint32_t AccumuloProxy_getUserAuthorizations_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getUserAuthorizations_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14514,7 +14514,7 @@ AccumuloProxy_getUserAuthorizations_result::~AccumuloProxy_getUserAuthorizations
 
 uint32_t AccumuloProxy_getUserAuthorizations_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14620,7 +14620,7 @@ AccumuloProxy_getUserAuthorizations_presult::~AccumuloProxy_getUserAuthorization
 
 uint32_t AccumuloProxy_getUserAuthorizations_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14694,7 +14694,7 @@ AccumuloProxy_grantSystemPermission_args::~AccumuloProxy_grantSystemPermission_a
 
 uint32_t AccumuloProxy_grantSystemPermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14753,7 +14753,7 @@ uint32_t AccumuloProxy_grantSystemPermission_args::read(::apache::thrift::protoc
 
 uint32_t AccumuloProxy_grantSystemPermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantSystemPermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14780,7 +14780,7 @@ AccumuloProxy_grantSystemPermission_pargs::~AccumuloProxy_grantSystemPermission_
 
 uint32_t AccumuloProxy_grantSystemPermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantSystemPermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14807,7 +14807,7 @@ AccumuloProxy_grantSystemPermission_result::~AccumuloProxy_grantSystemPermission
 
 uint32_t AccumuloProxy_grantSystemPermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14881,7 +14881,7 @@ AccumuloProxy_grantSystemPermission_presult::~AccumuloProxy_grantSystemPermissio
 
 uint32_t AccumuloProxy_grantSystemPermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14935,7 +14935,7 @@ AccumuloProxy_grantTablePermission_args::~AccumuloProxy_grantTablePermission_arg
 
 uint32_t AccumuloProxy_grantTablePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15002,7 +15002,7 @@ uint32_t AccumuloProxy_grantTablePermission_args::read(::apache::thrift::protoco
 
 uint32_t AccumuloProxy_grantTablePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantTablePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15033,7 +15033,7 @@ AccumuloProxy_grantTablePermission_pargs::~AccumuloProxy_grantTablePermission_pa
 
 uint32_t AccumuloProxy_grantTablePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantTablePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15064,7 +15064,7 @@ AccumuloProxy_grantTablePermission_result::~AccumuloProxy_grantTablePermission_r
 
 uint32_t AccumuloProxy_grantTablePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15150,7 +15150,7 @@ AccumuloProxy_grantTablePermission_presult::~AccumuloProxy_grantTablePermission_
 
 uint32_t AccumuloProxy_grantTablePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15212,7 +15212,7 @@ AccumuloProxy_hasSystemPermission_args::~AccumuloProxy_hasSystemPermission_args(
 
 uint32_t AccumuloProxy_hasSystemPermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15271,7 +15271,7 @@ uint32_t AccumuloProxy_hasSystemPermission_args::read(::apache::thrift::protocol
 
 uint32_t AccumuloProxy_hasSystemPermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasSystemPermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15298,7 +15298,7 @@ AccumuloProxy_hasSystemPermission_pargs::~AccumuloProxy_hasSystemPermission_parg
 
 uint32_t AccumuloProxy_hasSystemPermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasSystemPermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15325,7 +15325,7 @@ AccumuloProxy_hasSystemPermission_result::~AccumuloProxy_hasSystemPermission_res
 
 uint32_t AccumuloProxy_hasSystemPermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15411,7 +15411,7 @@ AccumuloProxy_hasSystemPermission_presult::~AccumuloProxy_hasSystemPermission_pr
 
 uint32_t AccumuloProxy_hasSystemPermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15473,7 +15473,7 @@ AccumuloProxy_hasTablePermission_args::~AccumuloProxy_hasTablePermission_args()
 
 uint32_t AccumuloProxy_hasTablePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15540,7 +15540,7 @@ uint32_t AccumuloProxy_hasTablePermission_args::read(::apache::thrift::protocol:
 
 uint32_t AccumuloProxy_hasTablePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasTablePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15571,7 +15571,7 @@ AccumuloProxy_hasTablePermission_pargs::~AccumuloProxy_hasTablePermission_pargs(
 
 uint32_t AccumuloProxy_hasTablePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasTablePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15602,7 +15602,7 @@ AccumuloProxy_hasTablePermission_result::~AccumuloProxy_hasTablePermission_resul
 
 uint32_t AccumuloProxy_hasTablePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15700,7 +15700,7 @@ AccumuloProxy_hasTablePermission_presult::~AccumuloProxy_hasTablePermission_pres
 
 uint32_t AccumuloProxy_hasTablePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15770,7 +15770,7 @@ AccumuloProxy_listLocalUsers_args::~AccumuloProxy_listLocalUsers_args() throw()
 
 uint32_t AccumuloProxy_listLocalUsers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15811,7 +15811,7 @@ uint32_t AccumuloProxy_listLocalUsers_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_listLocalUsers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listLocalUsers_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15830,7 +15830,7 @@ AccumuloProxy_listLocalUsers_pargs::~AccumuloProxy_listLocalUsers_pargs() throw(
 
 uint32_t AccumuloProxy_listLocalUsers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listLocalUsers_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15849,7 +15849,7 @@ AccumuloProxy_listLocalUsers_result::~AccumuloProxy_listLocalUsers_result() thro
 
 uint32_t AccumuloProxy_listLocalUsers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15968,7 +15968,7 @@ AccumuloProxy_listLocalUsers_presult::~AccumuloProxy_listLocalUsers_presult() th
 
 uint32_t AccumuloProxy_listLocalUsers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16051,7 +16051,7 @@ AccumuloProxy_revokeSystemPermission_args::~AccumuloProxy_revokeSystemPermission
 
 uint32_t AccumuloProxy_revokeSystemPermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16110,7 +16110,7 @@ uint32_t AccumuloProxy_revokeSystemPermission_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_revokeSystemPermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeSystemPermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16137,7 +16137,7 @@ AccumuloProxy_revokeSystemPermission_pargs::~AccumuloProxy_revokeSystemPermissio
 
 uint32_t AccumuloProxy_revokeSystemPermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeSystemPermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16164,7 +16164,7 @@ AccumuloProxy_revokeSystemPermission_result::~AccumuloProxy_revokeSystemPermissi
 
 uint32_t AccumuloProxy_revokeSystemPermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16238,7 +16238,7 @@ AccumuloProxy_revokeSystemPermission_presult::~AccumuloProxy_revokeSystemPermiss
 
 uint32_t AccumuloProxy_revokeSystemPermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16292,7 +16292,7 @@ AccumuloProxy_revokeTablePermission_args::~AccumuloProxy_revokeTablePermission_a
 
 uint32_t AccumuloProxy_revokeTablePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16359,7 +16359,7 @@ uint32_t AccumuloProxy_revokeTablePermission_args::read(::apache::thrift::protoc
 
 uint32_t AccumuloProxy_revokeTablePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeTablePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16390,7 +16390,7 @@ AccumuloProxy_revokeTablePermission_pargs::~AccumuloProxy_revokeTablePermission_
 
 uint32_t AccumuloProxy_revokeTablePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeTablePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16421,7 +16421,7 @@ AccumuloProxy_revokeTablePermission_result::~AccumuloProxy_revokeTablePermission
 
 uint32_t AccumuloProxy_revokeTablePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16507,7 +16507,7 @@ AccumuloProxy_revokeTablePermission_presult::~AccumuloProxy_revokeTablePermissio
 
 uint32_t AccumuloProxy_revokeTablePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16569,7 +16569,7 @@ AccumuloProxy_grantNamespacePermission_args::~AccumuloProxy_grantNamespacePermis
 
 uint32_t AccumuloProxy_grantNamespacePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16636,7 +16636,7 @@ uint32_t AccumuloProxy_grantNamespacePermission_args::read(::apache::thrift::pro
 
 uint32_t AccumuloProxy_grantNamespacePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantNamespacePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16667,7 +16667,7 @@ AccumuloProxy_grantNamespacePermission_pargs::~AccumuloProxy_grantNamespacePermi
 
 uint32_t AccumuloProxy_grantNamespacePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantNamespacePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16698,7 +16698,7 @@ AccumuloProxy_grantNamespacePermission_result::~AccumuloProxy_grantNamespacePerm
 
 uint32_t AccumuloProxy_grantNamespacePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16772,7 +16772,7 @@ AccumuloProxy_grantNamespacePermission_presult::~AccumuloProxy_grantNamespacePer
 
 uint32_t AccumuloProxy_grantNamespacePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16826,7 +16826,7 @@ AccumuloProxy_hasNamespacePermission_args::~AccumuloProxy_hasNamespacePermission
 
 uint32_t AccumuloProxy_hasNamespacePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16893,7 +16893,7 @@ uint32_t AccumuloProxy_hasNamespacePermission_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_hasNamespacePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNamespacePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16924,7 +16924,7 @@ AccumuloProxy_hasNamespacePermission_pargs::~AccumuloProxy_hasNamespacePermissio
 
 uint32_t AccumuloProxy_hasNamespacePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNamespacePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16955,7 +16955,7 @@ AccumuloProxy_hasNamespacePermission_result::~AccumuloProxy_hasNamespacePermissi
 
 uint32_t AccumuloProxy_hasNamespacePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17041,7 +17041,7 @@ AccumuloProxy_hasNamespacePermission_presult::~AccumuloProxy_hasNamespacePermiss
 
 uint32_t AccumuloProxy_hasNamespacePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17103,7 +17103,7 @@ AccumuloProxy_revokeNamespacePermission_args::~AccumuloProxy_revokeNamespacePerm
 
 uint32_t AccumuloProxy_revokeNamespacePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17170,7 +17170,7 @@ uint32_t AccumuloProxy_revokeNamespacePermission_args::read(::apache::thrift::pr
 
 uint32_t AccumuloProxy_revokeNamespacePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeNamespacePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17201,7 +17201,7 @@ AccumuloProxy_revokeNamespacePermission_pargs::~AccumuloProxy_revokeNamespacePer
 
 uint32_t AccumuloProxy_revokeNamespacePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeNamespacePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17232,7 +17232,7 @@ AccumuloProxy_revokeNamespacePermission_result::~AccumuloProxy_revokeNamespacePe
 
 uint32_t AccumuloProxy_revokeNamespacePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17306,7 +17306,7 @@ AccumuloProxy_revokeNamespacePermission_presult::~AccumuloProxy_revokeNamespaceP
 
 uint32_t AccumuloProxy_revokeNamespacePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17360,7 +17360,7 @@ AccumuloProxy_createBatchScanner_args::~AccumuloProxy_createBatchScanner_args()
 
 uint32_t AccumuloProxy_createBatchScanner_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17417,7 +17417,7 @@ uint32_t AccumuloProxy_createBatchScanner_args::read(::apache::thrift::protocol:
 
 uint32_t AccumuloProxy_createBatchScanner_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createBatchScanner_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17444,7 +17444,7 @@ AccumuloProxy_createBatchScanner_pargs::~AccumuloProxy_createBatchScanner_pargs(
 
 uint32_t AccumuloProxy_createBatchScanner_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createBatchScanner_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17471,7 +17471,7 @@ AccumuloProxy_createBatchScanner_result::~AccumuloProxy_createBatchScanner_resul
 
 uint32_t AccumuloProxy_createBatchScanner_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17569,7 +17569,7 @@ AccumuloProxy_createBatchScanner_presult::~AccumuloProxy_createBatchScanner_pres
 
 uint32_t AccumuloProxy_createBatchScanner_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17639,7 +17639,7 @@ AccumuloProxy_createScanner_args::~AccumuloProxy_createScanner_args() throw() {
 
 uint32_t AccumuloProxy_createScanner_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17696,7 +17696,7 @@ uint32_t AccumuloProxy_createScanner_args::read(::apache::thrift::protocol::TPro
 
 uint32_t AccumuloProxy_createScanner_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createScanner_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17723,7 +17723,7 @@ AccumuloProxy_createScanner_pargs::~AccumuloProxy_createScanner_pargs() throw()
 
 uint32_t AccumuloProxy_createScanner_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createScanner_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17750,7 +17750,7 @@ AccumuloProxy_createScanner_result::~AccumuloProxy_createScanner_result() throw(
 
 uint32_t AccumuloProxy_createScanner_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17848,7 +17848,7 @@ AccumuloProxy_createScanner_presult::~AccumuloProxy_createScanner_presult() thro
 
 uint32_t AccumuloProxy_createScanner_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17918,7 +17918,7 @@ AccumuloProxy_hasNext_args::~AccumuloProxy_hasNext_args() throw() {
 
 uint32_t AccumuloProxy_hasNext_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17959,7 +17959,7 @@ uint32_t AccumuloProxy_hasNext_args::read(::apache::thrift::protocol::TProtocol*
 
 uint32_t AccumuloProxy_hasNext_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNext_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -17978,7 +17978,7 @@ AccumuloProxy_hasNext_pargs::~AccumuloProxy_hasNext_pargs() throw() {
 
 uint32_t AccumuloProxy_hasNext_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNext_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -17997,7 +17997,7 @@ AccumuloProxy_hasNext_result::~AccumuloProxy_hasNext_result() throw() {
 
 uint32_t AccumuloProxy_hasNext_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18071,7 +18071,7 @@ AccumuloProxy_hasNext_presult::~AccumuloProxy_hasNext_presult() throw() {
 
 uint32_t AccumuloProxy_hasNext_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18125,7 +18125,7 @@ AccumuloProxy_nextEntry_args::~AccumuloProxy_nextEntry_args() throw() {
 
 uint32_t AccumuloProxy_nextEntry_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18166,7 +18166,7 @@ uint32_t AccumuloProxy_nextEntry_args::read(::apache::thrift::protocol::TProtoco
 
 uint32_t AccumuloProxy_nextEntry_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextEntry_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18185,7 +18185,7 @@ AccumuloProxy_nextEntry_pargs::~AccumuloProxy_nextEntry_pargs() throw() {
 
 uint32_t AccumuloProxy_nextEntry_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextEntry_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18204,7 +18204,7 @@ AccumuloProxy_nextEntry_result::~AccumuloProxy_nextEntry_result() throw() {
 
 uint32_t AccumuloProxy_nextEntry_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18302,7 +18302,7 @@ AccumuloProxy_nextEntry_presult::~AccumuloProxy_nextEntry_presult() throw() {
 
 uint32_t AccumuloProxy_nextEntry_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18372,7 +18372,7 @@ AccumuloProxy_nextK_args::~AccumuloProxy_nextK_args() throw() {
 
 uint32_t AccumuloProxy_nextK_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18421,7 +18421,7 @@ uint32_t AccumuloProxy_nextK_args::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t AccumuloProxy_nextK_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextK_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18444,7 +18444,7 @@ AccumuloProxy_nextK_pargs::~AccumuloProxy_nextK_pargs() throw() {
 
 uint32_t AccumuloProxy_nextK_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextK_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18467,7 +18467,7 @@ AccumuloProxy_nextK_result::~AccumuloProxy_nextK_result() throw() {
 
 uint32_t AccumuloProxy_nextK_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18565,7 +18565,7 @@ AccumuloProxy_nextK_presult::~AccumuloProxy_nextK_presult() throw() {
 
 uint32_t AccumuloProxy_nextK_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18635,7 +18635,7 @@ AccumuloProxy_closeScanner_args::~AccumuloProxy_closeScanner_args() throw() {
 
 uint32_t AccumuloProxy_closeScanner_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18676,7 +18676,7 @@ uint32_t AccumuloProxy_closeScanner_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_closeScanner_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeScanner_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18695,7 +18695,7 @@ AccumuloProxy_closeScanner_pargs::~AccumuloProxy_closeScanner_pargs() throw() {
 
 uint32_t AccumuloProxy_closeScanner_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeScanner_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18714,7 +18714,7 @@ AccumuloProxy_closeScanner_result::~AccumuloProxy_closeScanner_result() throw()
 
 uint32_t AccumuloProxy_closeScanner_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18776,7 +18776,7 @@ AccumuloProxy_closeScanner_presult::~AccumuloProxy_closeScanner_presult() throw(
 
 uint32_t AccumuloProxy_closeScanner_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18822,7 +18822,7 @@ AccumuloProxy_updateAndFlush_args::~AccumuloProxy_updateAndFlush_args() throw()
 
 uint32_t AccumuloProxy_updateAndFlush_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18906,7 +18906,7 @@ uint32_t AccumuloProxy_updateAndFlush_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_updateAndFlush_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateAndFlush_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -18950,7 +18950,7 @@ AccumuloProxy_updateAndFlush_pargs::~AccumuloProxy_updateAndFlush_pargs() throw(
 
 uint32_t AccumuloProxy_updateAndFlush_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateAndFlush_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -18994,7 +18994,7 @@ AccumuloProxy_updateAndFlush_result::~AccumuloProxy_updateAndFlush_result() thro
 
 uint32_t AccumuloProxy_updateAndFlush_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19092,7 +19092,7 @@ AccumuloProxy_updateAndFlush_presult::~AccumuloProxy_updateAndFlush_presult() th
 
 uint32_t AccumuloProxy_updateAndFlush_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19162,7 +19162,7 @@ AccumuloProxy_createWriter_args::~AccumuloProxy_createWriter_args() throw() {
 
 uint32_t AccumuloProxy_createWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19219,7 +19219,7 @@ uint32_t AccumuloProxy_createWriter_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_createWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createWriter_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -19246,7 +19246,7 @@ AccumuloProxy_createWriter_pargs::~AccumuloProxy_createWriter_pargs() throw() {
 
 uint32_t AccumuloProxy_createWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createWriter_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -19273,7 +19273,7 @@ AccumuloProxy_createWriter_result::~AccumuloProxy_createWriter_result() throw()
 
 uint32_t AccumuloProxy_createWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19371,7 +19371,7 @@ AccumuloProxy_createWriter_presult::~AccumuloProxy_createWriter_presult() throw(
 
 uint32_t AccumuloProxy_createWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19441,7 +19441,7 @@ AccumuloProxy_update_args::~AccumuloProxy_update_args() throw() {
 
 uint32_t AccumuloProxy_update_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19517,7 +19517,7 @@ uint32_t AccumuloProxy_update_args::read(::apache::thrift::protocol::TProtocol*
 
 uint32_t AccumuloProxy_update_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_update_args");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19557,7 +19557,7 @@ AccumuloProxy_update_pargs::~AccumuloProxy_update_pargs() throw() {
 
 uint32_t AccumuloProxy_update_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_update_pargs");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19597,7 +19597,7 @@ AccumuloProxy_flush_args::~AccumuloProxy_flush_args() throw() {
 
 uint32_t AccumuloProxy_flush_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19638,7 +19638,7 @@ uint32_t AccumuloProxy_flush_args::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t AccumuloProxy_flush_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flush_args");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19657,7 +19657,7 @@ AccumuloProxy_flush_pargs::~AccumuloProxy_flush_pargs() throw() {
 
 uint32_t AccumuloProxy_flush_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flush_pargs");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19676,7 +19676,7 @@ AccumuloProxy_flush_result::~AccumuloProxy_flush_result() throw() {
 
 uint32_t AccumuloProxy_flush_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19750,7 +19750,7 @@ AccumuloProxy_flush_presult::~AccumuloProxy_flush_presult() throw() {
 
 uint32_t AccumuloProxy_flush_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19804,7 +19804,7 @@ AccumuloProxy_closeWriter_args::~AccumuloProxy_closeWriter_args() throw() {
 
 uint32_t AccumuloProxy_closeWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19845,7 +19845,7 @@ uint32_t AccumuloProxy_closeWriter_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_closeWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeWriter_args");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19864,7 +19864,7 @@ AccumuloProxy_closeWriter_pargs::~AccumuloProxy_closeWriter_pargs() throw() {
 
 uint32_t AccumuloProxy_closeWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeWriter_pargs");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19883,7 +19883,7 @@ AccumuloProxy_closeWriter_result::~AccumuloProxy_closeWriter_result() throw() {
 
 uint32_t AccumuloProxy_closeWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19957,7 +19957,7 @@ AccumuloProxy_closeWriter_presult::~AccumuloProxy_closeWriter_presult() throw()
 
 uint32_t AccumuloProxy_closeWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20011,7 +20011,7 @@ AccumuloProxy_updateRowConditionally_args::~AccumuloProxy_updateRowConditionally
 
 uint32_t AccumuloProxy_updateRowConditionally_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20076,7 +20076,7 @@ uint32_t AccumuloProxy_updateRowConditionally_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_updateRowConditionally_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowConditionally_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20107,7 +20107,7 @@ AccumuloProxy_updateRowConditionally_pargs::~AccumuloProxy_updateRowConditionall
 
 uint32_t AccumuloProxy_updateRowConditionally_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowConditionally_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20138,7 +20138,7 @@ AccumuloProxy_updateRowConditionally_result::~AccumuloProxy_updateRowConditional
 
 uint32_t AccumuloProxy_updateRowConditionally_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20238,7 +20238,7 @@ AccumuloProxy_updateRowConditionally_presult::~AccumuloProxy_updateRowConditiona
 
 uint32_t AccumuloProxy_updateRowConditionally_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20310,7 +20310,7 @@ AccumuloProxy_createConditionalWriter_args::~AccumuloProxy_createConditionalWrit
 
 uint32_t AccumuloProxy_createConditionalWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20367,7 +20367,7 @@ uint32_t AccumuloProxy_createConditionalWriter_args::read(::apache::thrift::prot
 
 uint32_t AccumuloProxy_createConditionalWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createConditionalWriter_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20394,7 +20394,7 @@ AccumuloProxy_createConditionalWriter_pargs::~AccumuloProxy_createConditionalWri
 
 uint32_t AccumuloProxy_createConditionalWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createConditionalWriter_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20421,7 +20421,7 @@ AccumuloProxy_createConditionalWriter_result::~AccumuloProxy_createConditionalWr
 
 uint32_t AccumuloProxy_createConditionalWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20519,7 +20519,7 @@ AccumuloProxy_createConditionalWriter_presult::~AccumuloProxy_createConditionalW
 
 uint32_t AccumuloProxy_createConditionalWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20589,7 +20589,7 @@ AccumuloProxy_updateRowsConditionally_args::~AccumuloProxy_updateRowsConditional
 
 uint32_t AccumuloProxy_updateRowsConditionally_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20653,7 +20653,7 @@ uint32_t AccumuloProxy_updateRowsConditionally_args::read(::apache::thrift::prot
 
 uint32_t AccumuloProxy_updateRowsConditionally_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowsConditionally_args");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -20685,7 +20685,7 @@ AccumuloProxy_updateRowsConditionally_pargs::~AccumuloProxy_updateRowsConditiona
 
 uint32_t AccumuloProxy_updateRowsConditionally_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowsConditionally_pargs");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -20717,7 +20717,7 @@ AccumuloProxy_updateRowsConditionally_result::~AccumuloProxy_updateRowsCondition
 
 uint32_t AccumuloProxy_updateRowsConditionally_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20841,7 +20841,7 @@ AccumuloProxy_updateRowsConditionally_presult::~AccumuloProxy_updateRowsConditio
 
 uint32_t AccumuloProxy_updateRowsConditionally_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20928,7 +20928,7 @@ AccumuloProxy_closeConditionalWriter_args::~AccumuloProxy_closeConditionalWriter
 
 uint32_t AccumuloProxy_closeConditionalWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20969,7 +20969,7 @@ uint32_t AccumuloProxy_closeConditionalWriter_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_closeConditionalWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeConditionalWriter_args");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -20988,7 +20988,7 @@ AccumuloProxy_closeConditionalWriter_pargs::~AccumuloProxy_closeConditionalWrite
 
 uint32_t AccumuloProxy_closeConditionalWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeConditionalWriter_pargs");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -21007,7 +21007,7 @@ AccumuloProxy_closeConditionalWriter_result::~AccumuloProxy_closeConditionalWrit
 
 uint32_t AccumuloProxy_closeConditionalWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21051,7 +21051,7 @@ AccumuloProxy_closeConditionalWriter_presult::~AccumuloProxy_closeConditionalWri
 
 uint32_t AccumuloProxy_closeConditionalWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21084,7 +21084,7 @@ AccumuloProxy_getRowRange_args::~AccumuloProxy_getRowRange_args() throw() {
 
 uint32_t AccumuloProxy_getRowRange_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21125,7 +21125,7 @@ uint32_t AccumuloProxy_getRowRange_args::read(::apache::thrift::protocol::TProto
 
 uint32_t AccumuloProxy_getRowRange_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getRowRange_args");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 1);
@@ -21144,7 +21144,7 @@ AccumuloProxy_getRowRange_pargs::~AccumuloProxy_getRowRange_pargs() throw() {
 
 uint32_t AccumuloProxy_getRowRange_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getRowRange_pargs");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 1);
@@ -21163,7 +21163,7 @@ AccumuloProxy_getRowRange_result::~AccumuloProxy_getRowRange_result() throw() {
 
 uint32_t AccumuloProxy_getRowRange_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21225,7 +21225,7 @@ AccumuloProxy_getRowRange_presult::~AccumuloProxy_getRowRange_presult() throw()
 
 uint32_t AccumuloProxy_getRowRange_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21271,7 +21271,7 @@ AccumuloProxy_getFollowing_args::~AccumuloProxy_getFollowing_args() throw() {
 
 uint32_t AccumuloProxy_getFollowing_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21322,7 +21322,7 @@ uint32_t AccumuloProxy_getFollowing_args::read(::apache::thrift::protocol::TProt
 
 uint32_t AccumuloProxy_getFollowing_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getFollowing_args");
 
   xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -21345,7 +21345,7 @@ AccumuloProxy_getFollowing_pargs::~AccumuloProxy_getFollowing_pargs() throw() {
 
 uint32_t AccumuloProxy_getFollowing_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getFollowing_pargs");
 
   xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -21368,7 +21368,7 @@ AccumuloProxy_getFollowing_result::~AccumuloProxy_getFollowing_result() throw()
 
 uint32_t AccumuloProxy_getFollowing_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21430,7 +21430,7 @@ AccumuloProxy_getFollowing_presult::~AccumuloProxy_getFollowing_presult() throw(
 
 uint32_t AccumuloProxy_getFollowing_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21476,7 +21476,7 @@ AccumuloProxy_systemNamespace_args::~AccumuloProxy_systemNamespace_args() throw(
 
 uint32_t AccumuloProxy_systemNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21504,7 +21504,7 @@ uint32_t AccumuloProxy_systemNamespace_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_systemNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_systemNamespace_args");
 
   xfer += oprot->writeFieldStop();
@@ -21519,7 +21519,7 @@ AccumuloProxy_systemNamespace_pargs::~AccumuloProxy_systemNamespace_pargs() thro
 
 uint32_t AccumuloProxy_systemNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_systemNamespace_pargs");
 
   xfer += oprot->writeFieldStop();
@@ -21534,7 +21534,7 @@ AccumuloProxy_systemNamespace_result::~AccumuloProxy_systemNamespace_result() th
 
 uint32_t AccumuloProxy_systemNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21596,7 +21596,7 @@ AccumuloProxy_systemNamespace_presult::~AccumuloProxy_systemNamespace_presult()
 
 uint32_t AccumuloProxy_systemNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21642,7 +21642,7 @@ AccumuloProxy_defaultNamespace_args::~AccumuloProxy_defaultNamespace_args() thro
 
 uint32_t AccumuloProxy_defaultNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21670,7 +21670,7 @@ uint32_t AccumuloProxy_defaultNamespace_args::read(::apache::thrift::protocol::T
 
 uint32_t AccumuloProxy_defaultNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_defaultNamespace_args");
 
   xfer += oprot->writeFieldStop();
@@ -21685,7 +21685,7 @@ AccumuloProxy_defaultNamespace_pargs::~AccumuloProxy_defaultNamespace_pargs() th
 
 uint32_t AccumuloProxy_defaultNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_defaultNamespace_pargs");
 
   xfer += oprot->writeFieldStop();
@@ -21700,7 +21700,7 @@ AccumuloProxy_defaultNamespace_result::~AccumuloProxy_defaultNamespace_result()
 
 uint32_t AccumuloProxy_defaultNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21762,7 +21762,7 @@ AccumuloProxy_defaultNamespace_presult::~AccumuloProxy_defaultNamespace_presult(
 
 uint32_t AccumuloProxy_defaultNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21808,7 +21808,7 @@ AccumuloProxy_listNamespaces_args::~AccumuloProxy_listNamespaces_args() throw()
 
 uint32_t AccumuloProxy_listNamespaces_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21849,7 +21849,7 @@ uint32_t AccumuloProxy_listNamespaces_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_listNamespaces_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaces_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -21868,7 +21868,7 @@ AccumuloProxy_listNamespaces_pargs::~AccumuloProxy_listNamespaces_pargs() throw(
 
 uint32_t AccumuloProxy_listNamespaces_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaces_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -21887,7 +21887,7 @@ AccumuloProxy_listNamespaces_result::~AccumuloProxy_listNamespaces_result() thro
 
 uint32_t AccumuloProxy_listNamespaces_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21993,7 +21993,7 @@ AccumuloProxy_listNamespaces_presult::~AccumuloProxy_listNamespaces_presult() th
 
 uint32_t AccumuloProxy_listNamespaces_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22067,7 +22067,7 @@ AccumuloProxy_namespaceExists_args::~AccumuloProxy_namespaceExists_args() throw(
 
 uint32_t AccumuloProxy_namespaceExists_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22116,7 +22116,7 @@ uint32_t AccumuloProxy_namespaceExists_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_namespaceExists_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceExists_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22139,7 +22139,7 @@ AccumuloProxy_namespaceExists_pargs::~AccumuloProxy_namespaceExists_pargs() thro
 
 uint32_t AccumuloProxy_namespaceExists_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceExists_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22162,7 +22162,7 @@ AccumuloProxy_namespaceExists_result::~AccumuloProxy_namespaceExists_result() th
 
 uint32_t AccumuloProxy_namespaceExists_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22248,7 +22248,7 @@ AccumuloProxy_namespaceExists_presult::~AccumuloProxy_namespaceExists_presult()
 
 uint32_t AccumuloProxy_namespaceExists_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22310,7 +22310,7 @@ AccumuloProxy_createNamespace_args::~AccumuloProxy_createNamespace_args() throw(
 
 uint32_t AccumuloProxy_createNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22359,7 +22359,7 @@ uint32_t AccumuloProxy_createNamespace_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_createNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createNamespace_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22382,7 +22382,7 @@ AccumuloProxy_createNamespace_pargs::~AccumuloProxy_createNamespace_pargs() thro
 
 uint32_t AccumuloProxy_createNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createNamespace_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22405,7 +22405,7 @@ AccumuloProxy_createNamespace_result::~AccumuloProxy_createNamespace_result() th
 
 uint32_t AccumuloProxy_createNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22491,7 +22491,7 @@ AccumuloProxy_createNamespace_presult::~AccumuloProxy_createNamespace_presult()
 
 uint32_t AccumuloProxy_createNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22553,7 +22553,7 @@ AccumuloProxy_deleteNamespace_args::~AccumuloProxy_deleteNamespace_args() throw(
 
 uint32_t AccumuloProxy_deleteNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22602,7 +22602,7 @@ uint32_t AccumuloProxy_deleteNamespace_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_deleteNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteNamespace_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22625,7 +22625,7 @@ AccumuloProxy_deleteNamespace_pargs::~AccumuloProxy_deleteNamespace_pargs() thro
 
 uint32_t AccumuloProxy_deleteNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteNamespace_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22648,7 +22648,7 @@ AccumuloProxy_deleteNamespace_result::~AccumuloProxy_deleteNamespace_result() th
 
 uint32_t AccumuloProxy_deleteNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22746,7 +22746,7 @@ AccumuloProxy_deleteNamespace_presult::~AccumuloProxy_deleteNamespace_presult()
 
 uint32_t AccumuloProxy_deleteNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22816,7 +22816,7 @@ AccumuloProxy_renameNamespace_args::~AccumuloProxy_renameNamespace_args() throw(
 
 uint32_t AccumuloProxy_renameNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22873,7 +22873,7 @@ uint32_t AccumuloProxy_renameNamespace_args::read(::apache::thrift::protocol::TP
 
 uint32_t AccumuloProxy_renameNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameNamespace_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22900,7 +22900,7 @@ AccumuloProxy_renameNamespace_pargs::~AccumuloProxy_renameNamespace_pargs() thro
 
 uint32_t AccumuloProxy_renameNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameNamespace_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22927,7 +22927,7 @@ AccumuloProxy_renameNamespace_result::~AccumuloProxy_renameNamespace_result() th
 
 uint32_t AccumuloProxy_renameNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23025,7 +23025,7 @@ AccumuloProxy_renameNamespace_presult::~AccumuloProxy_renameNamespace_presult()
 
 uint32_t AccumuloProxy_renameNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23095,7 +23095,7 @@ AccumuloProxy_setNamespaceProperty_args::~AccumuloProxy_setNamespaceProperty_arg
 
 uint32_t AccumuloProxy_setNamespaceProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23160,7 +23160,7 @@ uint32_t AccumuloProxy_setNamespaceProperty_args::read(::apache::thrift::protoco
 
 uint32_t AccumuloProxy_setNamespaceProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setNamespaceProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23191,7 +23191,7 @@ AccumuloProxy_setNamespaceProperty_pargs::~AccumuloProxy_setNamespaceProperty_pa
 
 uint32_t AccumuloProxy_setNamespaceProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setNamespaceProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23222,7 +23222,7 @@ AccumuloProxy_setNamespaceProperty_result::~AccumuloProxy_setNamespaceProperty_r
 
 uint32_t AccumuloProxy_setNamespaceProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23308,7 +23308,7 @@ AccumuloProxy_setNamespaceProperty_presult::~AccumuloProxy_setNamespaceProperty_
 
 uint32_t AccumuloProxy_setNamespaceProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23370,7 +23370,7 @@ AccumuloProxy_removeNamespaceProperty_args::~AccumuloProxy_removeNamespaceProper
 
 uint32_t AccumuloProxy_removeNamespaceProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23427,7 +23427,7 @@ uint32_t AccumuloProxy_removeNamespaceProperty_args::read(::apache::thrift::prot
 
 uint32_t AccumuloProxy_removeNamespaceProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23454,7 +23454,7 @@ AccumuloProxy_removeNamespaceProperty_pargs::~AccumuloProxy_removeNamespacePrope
 
 uint32_t AccumuloProxy_removeNamespaceProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23481,7 +23481,7 @@ AccumuloProxy_removeNamespaceProperty_result::~AccumuloProxy_removeNamespaceProp
 
 uint32_t AccumuloProxy_removeNamespaceProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23567,7 +23567,7 @@ AccumuloProxy_removeNamespaceProperty_presult::~AccumuloProxy_removeNamespacePro
 
 uint32_t AccumuloProxy_removeNamespaceProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23629,7 +23629,7 @@ AccumuloProxy_getNamespaceProperties_args::~AccumuloProxy_getNamespaceProperties
 
 uint32_t AccumuloProxy_getNamespaceProperties_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23678,7 +23678,7 @@ uint32_t AccumuloProxy_getNamespaceProperties_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_getNamespaceProperties_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceProperties_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23701,7 +23701,7 @@ AccumuloProxy_getNamespaceProperties_pargs::~AccumuloProxy_getNamespacePropertie
 
 uint32_t AccumuloProxy_getNamespaceProperties_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceProperties_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23724,7 +23724,7 @@ AccumuloProxy_getNamespaceProperties_result::~AccumuloProxy_getNamespaceProperti
 
 uint32_t AccumuloProxy_getNamespaceProperties_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23846,7 +23846,7 @@ AccumuloProxy_getNamespaceProperties_presult::~AccumuloProxy_getNamespacePropert
 
 uint32_t AccumuloProxy_getNamespaceProperties_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23931,7 +23931,7 @@ AccumuloProxy_namespaceIdMap_args::~AccumuloProxy_namespaceIdMap_args() throw()
 
 uint32_t AccumuloProxy_namespaceIdMap_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23972,7 +23972,7 @@ uint32_t AccumuloProxy_namespaceIdMap_args::read(::apache::thrift::protocol::TPr
 
 uint32_t AccumuloProxy_namespaceIdMap_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceIdMap_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23991,7 +23991,7 @@ AccumuloProxy_namespaceIdMap_pargs::~AccumuloProxy_namespaceIdMap_pargs() throw(
 
 uint32_t AccumuloProxy_namespaceIdMap_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceIdMap_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24010,7 +24010,7 @@ AccumuloProxy_namespaceIdMap_result::~AccumuloProxy_namespaceIdMap_result() thro
 
 uint32_t AccumuloProxy_namespaceIdMap_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24120,7 +24120,7 @@ AccumuloProxy_namespaceIdMap_presult::~AccumuloProxy_namespaceIdMap_presult() th
 
 uint32_t AccumuloProxy_namespaceIdMap_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24197,7 +24197,7 @@ AccumuloProxy_attachNamespaceIterator_args::~AccumuloProxy_attachNamespaceIterat
 
 uint32_t AccumuloProxy_attachNamespaceIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24277,7 +24277,7 @@ uint32_t AccumuloProxy_attachNamespaceIterator_args::read(::apache::thrift::prot
 
 uint32_t AccumuloProxy_attachNamespaceIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachNamespaceIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24316,7 +24316,7 @@ AccumuloProxy_attachNamespaceIterator_pargs::~AccumuloProxy_attachNamespaceItera
 
 uint32_t AccumuloProxy_attachNamespaceIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachNamespaceIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24355,7 +24355,7 @@ AccumuloProxy_attachNamespaceIterator_result::~AccumuloProxy_attachNamespaceIter
 
 uint32_t AccumuloProxy_attachNamespaceIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24441,7 +24441,7 @@ AccumuloProxy_attachNamespaceIterator_presult::~AccumuloProxy_attachNamespaceIte
 
 uint32_t AccumuloProxy_attachNamespaceIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24503,7 +24503,7 @@ AccumuloProxy_removeNamespaceIterator_args::~AccumuloProxy_removeNamespaceIterat
 
 uint32_t AccumuloProxy_removeNamespaceIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24583,7 +24583,7 @@ uint32_t AccumuloProxy_removeNamespaceIterator_args::read(::apache::thrift::prot
 
 uint32_t AccumuloProxy_removeNamespaceIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24622,7 +24622,7 @@ AccumuloProxy_removeNamespaceIterator_pargs::~AccumuloProxy_removeNamespaceItera
 
 uint32_t AccumuloProxy_removeNamespaceIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24661,7 +24661,7 @@ AccumuloProxy_removeNamespaceIterator_result::~AccumuloProxy_removeNamespaceIter
 
 uint32_t AccumuloProxy_removeNamespaceIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24747,7 +24747,7 @@ AccumuloProxy_removeNamespaceIterator_presult::~AccumuloProxy_removeNamespaceIte
 
 uint32_t AccumuloProxy_removeNamespaceIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24809,7 +24809,7 @@ AccumuloProxy_getNamespaceIteratorSetting_args::~AccumuloProxy_getNamespaceItera
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24876,7 +24876,7 @@ uint32_t AccumuloProxy_getNamespaceIteratorSetting_args::read(::apache::thrift::
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceIteratorSetting_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24907,7 +24907,7 @@ AccumuloProxy_getNamespaceIteratorSetting_pargs::~AccumuloProxy_getNamespaceIter
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceIteratorSetting_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24938,7 +24938,7 @@ AccumuloProxy_getNamespaceIteratorSetting_result::~AccumuloProxy_getNamespaceIte
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25036,7 +25036,7 @@ AccumuloProxy_getNamespaceIteratorSetting_presult::~AccumuloProxy_getNamespaceIt
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25106,7 +25106,7 @@ AccumuloProxy_listNamespaceIterators_args::~AccumuloProxy_listNamespaceIterators
 
 uint32_t AccumuloProxy_listNamespaceIterators_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25155,7 +25155,7 @@ uint32_t AccumuloProxy_listNamespaceIterators_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_listNamespaceIterators_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceIterators_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25178,7 +25178,7 @@ AccumuloProxy_listNamespaceIterators_pargs::~AccumuloProxy_listNamespaceIterator
 
 uint32_t AccumuloProxy_listNamespaceIterators_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceIterators_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25201,7 +25201,7 @@ AccumuloProxy_listNamespaceIterators_result::~AccumuloProxy_listNamespaceIterato
 
 uint32_t AccumuloProxy_listNamespaceIterators_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25346,7 +25346,7 @@ AccumuloProxy_listNamespaceIterators_presult::~AccumuloProxy_listNamespaceIterat
 
 uint32_t AccumuloProxy_listNamespaceIterators_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25446,7 +25446,7 @@ AccumuloProxy_checkNamespaceIteratorConflicts_args::~AccumuloProxy_checkNamespac
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25526,7 +25526,7 @@ uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_args::read(::apache::thri
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkNamespaceIteratorConflicts_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25565,7 +25565,7 @@ AccumuloProxy_checkNamespaceIteratorConflicts_pargs::~AccumuloProxy_checkNamespa
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkNamespaceIteratorConflicts_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25604,7 +25604,7 @@ AccumuloProxy_checkNamespaceIteratorConflicts_result::~AccumuloProxy_checkNamesp
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25690,7 +25690,7 @@ AccumuloProxy_checkNamespaceIteratorConflicts_presult::~AccumuloProxy_checkNames
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25752,7 +25752,7 @@ AccumuloProxy_addNamespaceConstraint_args::~AccumuloProxy_addNamespaceConstraint
 
 uint32_t AccumuloProxy_addNamespaceConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25809,7 +25809,7 @@ uint32_t AccumuloProxy_addNamespaceConstraint_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_addNamespaceConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addNamespaceConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25836,7 +25836,7 @@ AccumuloProxy_addNamespaceConstraint_pargs::~AccumuloProxy_addNamespaceConstrain
 
 uint32_t AccumuloProxy_addNamespaceConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addNamespaceConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25863,7 +25863,7 @@ AccumuloProxy_addNamespaceConstraint_result::~AccumuloProxy_addNamespaceConstrai
 
 uint32_t AccumuloProxy_addNamespaceConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25961,7 +25961,7 @@ AccumuloProxy_addNamespaceConstraint_presult::~AccumuloProxy_addNamespaceConstra
 
 uint32_t AccumuloProxy_addNamespaceConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26031,7 +26031,7 @@ AccumuloProxy_removeNamespaceConstraint_args::~AccumuloProxy_removeNamespaceCons
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26088,7 +26088,7 @@ uint32_t AccumuloProxy_removeNamespaceConstraint_args::read(::apache::thrift::pr
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26115,7 +26115,7 @@ AccumuloProxy_removeNamespaceConstraint_pargs::~AccumuloProxy_removeNamespaceCon
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26142,7 +26142,7 @@ AccumuloProxy_removeNamespaceConstraint_result::~AccumuloProxy_removeNamespaceCo
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26228,7 +26228,7 @@ AccumuloProxy_removeNamespaceConstraint_presult::~AccumuloProxy_removeNamespaceC
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26290,7 +26290,7 @@ AccumuloProxy_listNamespaceConstraints_args::~AccumuloProxy_listNamespaceConstra
 
 uint32_t AccumuloProxy_listNamespaceConstraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26339,7 +26339,7 @@ uint32_t AccumuloProxy_listNamespaceConstraints_args::read(::apache::thrift::pro
 
 uint32_t AccumuloProxy_listNamespaceConstraints_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceConstraints_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26362,7 +26362,7 @@ AccumuloProxy_listNamespaceConstraints_pargs::~AccumuloProxy_listNamespaceConstr
 
 uint32_t AccumuloProxy_listNamespaceConstraints_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceConstraints_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26385,7 +26385,7 @@ AccumuloProxy_listNamespaceConstraints_result::~AccumuloProxy_listNamespaceConst
 
 uint32_t AccumuloProxy_listNamespaceConstraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26507,7 +26507,7 @@ AccumuloProxy_listNamespaceConstraints_presult::~AccumuloProxy_listNamespaceCons
 
 uint32_t AccumuloProxy_listNamespaceConstraints_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26592,7 +26592,7 @@ AccumuloProxy_testNamespaceClassLoad_args::~AccumuloProxy_testNamespaceClassLoad
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26657,7 +26657,7 @@ uint32_t AccumuloProxy_testNamespaceClassLoad_args::read(::apache::thrift::proto
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testNamespaceClassLoad_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26688,7 +26688,7 @@ AccumuloProxy_testNamespaceClassLoad_pargs::~AccumuloProxy_testNamespaceClassLoa
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testNamespaceClassLoad_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26719,7 +26719,7 @@ AccumuloProxy_testNamespaceClassLoad_result::~AccumuloProxy_testNamespaceClassLo
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26817,7 +26817,7 @@ AccumuloProxy_testNamespaceClassLoad_presult::~AccumuloProxy_testNamespaceClassL
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -39372,10 +39372,10 @@ void AccumuloProxyProcessor::process_testNamespaceClassLoad(int32_t seqid, ::apa
   }
 }
 
-::boost::shared_ptr< ::apache::thrift::TProcessor > AccumuloProxyProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) {
+::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > AccumuloProxyProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) {
   ::apache::thrift::ReleaseHandler< AccumuloProxyIfFactory > cleanup(handlerFactory_);
-  ::boost::shared_ptr< AccumuloProxyIf > handler(handlerFactory_->getHandler(connInfo), cleanup);
-  ::boost::shared_ptr< ::apache::thrift::TProcessor > processor(new AccumuloProxyProcessor(handler));
+  ::apache::thrift::stdcxx::shared_ptr< AccumuloProxyIf > handler(handlerFactory_->getHandler(connInfo), cleanup);
+  ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > processor(new AccumuloProxyProcessor(handler));
   return processor;
 }
 
diff --git a/proxy/src/main/cpp/AccumuloProxy.h b/proxy/src/main/cpp/AccumuloProxy.h
index 7dd477bd12..2254b437d4 100644
--- a/proxy/src/main/cpp/AccumuloProxy.h
+++ b/proxy/src/main/cpp/AccumuloProxy.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,7 +29,7 @@
 
 namespace accumulo {
 
-#ifdef _WIN32
+#ifdef _MSC_VER
   #pragma warning( push )
   #pragma warning (disable : 4250 ) //inheriting methods via dominance 
 #endif
@@ -151,7 +151,7 @@ class AccumuloProxyIfFactory {
 
 class AccumuloProxyIfSingletonFactory : virtual public AccumuloProxyIfFactory {
  public:
-  AccumuloProxyIfSingletonFactory(const boost::shared_ptr<AccumuloProxyIf>& iface) : iface_(iface) {}
+  AccumuloProxyIfSingletonFactory(const ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf>& iface) : iface_(iface) {}
   virtual ~AccumuloProxyIfSingletonFactory() {}
 
   virtual AccumuloProxyIf* getHandler(const ::apache::thrift::TConnectionInfo&) {
@@ -160,7 +160,7 @@ class AccumuloProxyIfSingletonFactory : virtual public AccumuloProxyIfFactory {
   virtual void releaseHandler(AccumuloProxyIf* /* handler */) {}
 
  protected:
-  boost::shared_ptr<AccumuloProxyIf> iface_;
+  ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface_;
 };
 
 class AccumuloProxyNull : virtual public AccumuloProxyIf {
@@ -13583,27 +13583,27 @@ class AccumuloProxy_testNamespaceClassLoad_presult {
 
 class AccumuloProxyClient : virtual public AccumuloProxyIf {
  public:
-  AccumuloProxyClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  AccumuloProxyClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
     setProtocol(prot);
   }
-  AccumuloProxyClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  AccumuloProxyClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     setProtocol(iprot,oprot);
   }
  private:
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
   setProtocol(prot,prot);
   }
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     piprot_=iprot;
     poprot_=oprot;
     iprot_ = iprot.get();
     oprot_ = oprot.get();
   }
  public:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
     return piprot_;
   }
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
     return poprot_;
   }
   void login(std::string& _return, const std::string& principal, const std::map<std::string, std::string> & loginProperties);
@@ -13906,15 +13906,15 @@ class AccumuloProxyClient : virtual public AccumuloProxyIf {
   void send_testNamespaceClassLoad(const std::string& login, const std::string& namespaceName, const std::string& className, const std::string& asTypeName);
   bool recv_testNamespaceClassLoad();
  protected:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
   ::apache::thrift::protocol::TProtocol* iprot_;
   ::apache::thrift::protocol::TProtocol* oprot_;
 };
 
 class AccumuloProxyProcessor : public ::apache::thrift::TDispatchProcessor {
  protected:
-  boost::shared_ptr<AccumuloProxyIf> iface_;
+  ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface_;
   virtual bool dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext);
  private:
   typedef  void (AccumuloProxyProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*);
@@ -14021,7 +14021,7 @@ class AccumuloProxyProcessor : public ::apache::thrift::TDispatchProcessor {
   void process_listNamespaceConstraints(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_testNamespaceClassLoad(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
  public:
-  AccumuloProxyProcessor(boost::shared_ptr<AccumuloProxyIf> iface) :
+  AccumuloProxyProcessor(::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface) :
     iface_(iface) {
     processMap_["login"] = &AccumuloProxyProcessor::process_login;
     processMap_["addConstraint"] = &AccumuloProxyProcessor::process_addConstraint;
@@ -14130,24 +14130,24 @@ class AccumuloProxyProcessor : public ::apache::thrift::TDispatchProcessor {
 
 class AccumuloProxyProcessorFactory : public ::apache::thrift::TProcessorFactory {
  public:
-  AccumuloProxyProcessorFactory(const ::boost::shared_ptr< AccumuloProxyIfFactory >& handlerFactory) :
+  AccumuloProxyProcessorFactory(const ::apache::thrift::stdcxx::shared_ptr< AccumuloProxyIfFactory >& handlerFactory) :
       handlerFactory_(handlerFactory) {}
 
-  ::boost::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo);
+  ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo);
 
  protected:
-  ::boost::shared_ptr< AccumuloProxyIfFactory > handlerFactory_;
+  ::apache::thrift::stdcxx::shared_ptr< AccumuloProxyIfFactory > handlerFactory_;
 };
 
 class AccumuloProxyMultiface : virtual public AccumuloProxyIf {
  public:
-  AccumuloProxyMultiface(std::vector<boost::shared_ptr<AccumuloProxyIf> >& ifaces) : ifaces_(ifaces) {
+  AccumuloProxyMultiface(std::vector<apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> >& ifaces) : ifaces_(ifaces) {
   }
   virtual ~AccumuloProxyMultiface() {}
  protected:
-  std::vector<boost::shared_ptr<AccumuloProxyIf> > ifaces_;
+  std::vector<apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> > ifaces_;
   AccumuloProxyMultiface() {}
-  void add(boost::shared_ptr<AccumuloProxyIf> iface) {
+  void add(::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface) {
     ifaces_.push_back(iface);
   }
  public:
@@ -15094,27 +15094,27 @@ class AccumuloProxyMultiface : virtual public AccumuloProxyIf {
 // only be used when you need to share a connection among multiple threads
 class AccumuloProxyConcurrentClient : virtual public AccumuloProxyIf {
  public:
-  AccumuloProxyConcurrentClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  AccumuloProxyConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
     setProtocol(prot);
   }
-  AccumuloProxyConcurrentClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  AccumuloProxyConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     setProtocol(iprot,oprot);
   }
  private:
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
   setProtocol(prot,prot);
   }
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     piprot_=iprot;
     poprot_=oprot;
     iprot_ = iprot.get();
     oprot_ = oprot.get();
   }
  public:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
     return piprot_;
   }
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
     return poprot_;
   }
   void login(std::string& _return, const std::string& principal, const std::map<std::string, std::string> & loginProperties);
@@ -15417,14 +15417,14 @@ class AccumuloProxyConcurrentClient : virtual public AccumuloProxyIf {
   int32_t send_testNamespaceClassLoad(const std::string& login, const std::string& namespaceName, const std::string& className, const std::string& asTypeName);
   bool recv_testNamespaceClassLoad(const int32_t seqid);
  protected:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
   ::apache::thrift::protocol::TProtocol* iprot_;
   ::apache::thrift::protocol::TProtocol* oprot_;
   ::apache::thrift::async::TConcurrentClientSyncInfo sync_;
 };
 
-#ifdef _WIN32
+#ifdef _MSC_VER
   #pragma warning( pop )
 #endif
 
diff --git a/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp b/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp
index 6c2f52f323..c208f68b95 100644
--- a/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp
+++ b/proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp
@@ -28,8 +28,6 @@ using namespace ::apache::thrift::protocol;
 using namespace ::apache::thrift::transport;
 using namespace ::apache::thrift::server;
 
-using boost::shared_ptr;
-
 using namespace  ::accumulo;
 
 class AccumuloProxyHandler : virtual public AccumuloProxyIf {
@@ -542,11 +540,11 @@ class AccumuloProxyHandler : virtual public AccumuloProxyIf {
 
 int main(int argc, char **argv) {
   int port = 9090;
-  shared_ptr<AccumuloProxyHandler> handler(new AccumuloProxyHandler());
-  shared_ptr<TProcessor> processor(new AccumuloProxyProcessor(handler));
-  shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
-  shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
-  shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
+  ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyHandler> handler(new AccumuloProxyHandler());
+  ::apache::thrift::stdcxx::shared_ptr<TProcessor> processor(new AccumuloProxyProcessor(handler));
+  ::apache::thrift::stdcxx::shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
+  ::apache::thrift::stdcxx::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
+  ::apache::thrift::stdcxx::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
 
   TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory);
   server.serve();
diff --git a/proxy/src/main/cpp/proxy_constants.cpp b/proxy/src/main/cpp/proxy_constants.cpp
index 07fb1b8f4a..d55dd82037 100644
--- a/proxy/src/main/cpp/proxy_constants.cpp
+++ b/proxy/src/main/cpp/proxy_constants.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/proxy/src/main/cpp/proxy_constants.h b/proxy/src/main/cpp/proxy_constants.h
index 436a732a90..222c51b72c 100644
--- a/proxy/src/main/cpp/proxy_constants.h
+++ b/proxy/src/main/cpp/proxy_constants.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/proxy/src/main/cpp/proxy_types.cpp b/proxy/src/main/cpp/proxy_types.cpp
index f4f17fc1ba..7a7459942c 100644
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -47,6 +47,16 @@ const char* _kPartialKeyNames[] = {
 };
 const std::map<int, const char*> _PartialKey_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kPartialKeyValues, _kPartialKeyNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const PartialKey::type& val) {
+  std::map<int, const char*>::const_iterator it = _PartialKey_VALUES_TO_NAMES.find(val);
+  if (it != _PartialKey_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kTablePermissionValues[] = {
   TablePermission::READ,
   TablePermission::WRITE,
@@ -65,6 +75,16 @@ const char* _kTablePermissionNames[] = {
 };
 const std::map<int, const char*> _TablePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kTablePermissionValues, _kTablePermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const TablePermission::type& val) {
+  std::map<int, const char*>::const_iterator it = _TablePermission_VALUES_TO_NAMES.find(val);
+  if (it != _TablePermission_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kSystemPermissionValues[] = {
   SystemPermission::GRANT,
   SystemPermission::CREATE_TABLE,
@@ -95,6 +115,16 @@ const char* _kSystemPermissionNames[] = {
 };
 const std::map<int, const char*> _SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, _kSystemPermissionValues, _kSystemPermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const SystemPermission::type& val) {
+  std::map<int, const char*>::const_iterator it = _SystemPermission_VALUES_TO_NAMES.find(val);
+  if (it != _SystemPermission_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kNamespacePermissionValues[] = {
   NamespacePermission::READ,
   NamespacePermission::WRITE,
@@ -119,6 +149,16 @@ const char* _kNamespacePermissionNames[] = {
 };
 const std::map<int, const char*> _NamespacePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(9, _kNamespacePermissionValues, _kNamespacePermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const NamespacePermission::type& val) {
+  std::map<int, const char*>::const_iterator it = _NamespacePermission_VALUES_TO_NAMES.find(val);
+  if (it != _NamespacePermission_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kScanTypeValues[] = {
   ScanType::SINGLE,
   ScanType::BATCH
@@ -129,6 +169,16 @@ const char* _kScanTypeNames[] = {
 };
 const std::map<int, const char*> _ScanType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kScanTypeValues, _kScanTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const ScanType::type& val) {
+  std::map<int, const char*>::const_iterator it = _ScanType_VALUES_TO_NAMES.find(val);
+  if (it != _ScanType_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kScanStateValues[] = {
   ScanState::IDLE,
   ScanState::RUNNING,
@@ -141,6 +191,16 @@ const char* _kScanStateNames[] = {
 };
 const std::map<int, const char*> _ScanState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kScanStateValues, _kScanStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const ScanState::type& val) {
+  std::map<int, const char*>::const_iterator it = _ScanState_VALUES_TO_NAMES.find(val);
+  if (it != _ScanState_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kConditionalStatusValues[] = {
   ConditionalStatus::ACCEPTED,
   ConditionalStatus::REJECTED,
@@ -157,6 +217,16 @@ const char* _kConditionalStatusNames[] = {
 };
 const std::map<int, const char*> _ConditionalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kConditionalStatusValues, _kConditionalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const ConditionalStatus::type& val) {
+  std::map<int, const char*>::const_iterator it = _ConditionalStatus_VALUES_TO_NAMES.find(val);
+  if (it != _ConditionalStatus_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kDurabilityValues[] = {
   Durability::DEFAULT,
   Durability::NONE,
@@ -173,6 +243,16 @@ const char* _kDurabilityNames[] = {
 };
 const std::map<int, const char*> _Durability_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kDurabilityValues, _kDurabilityNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const Durability::type& val) {
+  std::map<int, const char*>::const_iterator it = _Durability_VALUES_TO_NAMES.find(val);
+  if (it != _Durability_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kCompactionTypeValues[] = {
   CompactionType::MINOR,
   CompactionType::MERGE,
@@ -187,6 +267,16 @@ const char* _kCompactionTypeNames[] = {
 };
 const std::map<int, const char*> _CompactionType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kCompactionTypeValues, _kCompactionTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const CompactionType::type& val) {
+  std::map<int, const char*>::const_iterator it = _CompactionType_VALUES_TO_NAMES.find(val);
+  if (it != _CompactionType_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kCompactionReasonValues[] = {
   CompactionReason::USER,
   CompactionReason::SYSTEM,
@@ -203,6 +293,16 @@ const char* _kCompactionReasonNames[] = {
 };
 const std::map<int, const char*> _CompactionReason_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kCompactionReasonValues, _kCompactionReasonNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const CompactionReason::type& val) {
+  std::map<int, const char*>::const_iterator it = _CompactionReason_VALUES_TO_NAMES.find(val);
+  if (it != _CompactionReason_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kIteratorScopeValues[] = {
   IteratorScope::MINC,
   IteratorScope::MAJC,
@@ -215,6 +315,16 @@ const char* _kIteratorScopeNames[] = {
 };
 const std::map<int, const char*> _IteratorScope_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kIteratorScopeValues, _kIteratorScopeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const IteratorScope::type& val) {
+  std::map<int, const char*>::const_iterator it = _IteratorScope_VALUES_TO_NAMES.find(val);
+  if (it != _IteratorScope_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kTimeTypeValues[] = {
   TimeType::LOGICAL,
   TimeType::MILLIS
@@ -225,6 +335,16 @@ const char* _kTimeTypeNames[] = {
 };
 const std::map<int, const char*> _TimeType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kTimeTypeValues, _kTimeTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const TimeType::type& val) {
+  std::map<int, const char*>::const_iterator it = _TimeType_VALUES_TO_NAMES.find(val);
+  if (it != _TimeType_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 
 Key::~Key() throw() {
 }
@@ -250,10 +370,16 @@ void Key::__set_timestamp(const int64_t val) {
   this->timestamp = val;
 __isset.timestamp = true;
 }
+std::ostream& operator<<(std::ostream& out, const Key& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Key::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -326,7 +452,7 @@ uint32_t Key::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t Key::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Key");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 1);
@@ -425,10 +551,16 @@ void ColumnUpdate::__set_deleteCell(const bool val) {
   this->deleteCell = val;
 __isset.deleteCell = true;
 }
+std::ostream& operator<<(std::ostream& out, const ColumnUpdate& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -509,7 +641,7 @@ uint32_t ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ColumnUpdate::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ColumnUpdate");
 
   xfer += oprot->writeFieldBegin("colFamily", ::apache::thrift::protocol::T_STRING, 1);
@@ -599,10 +731,16 @@ void DiskUsage::__set_tables(const std::vector<std::string> & val) {
 void DiskUsage::__set_usage(const int64_t val) {
   this->usage = val;
 }
+std::ostream& operator<<(std::ostream& out, const DiskUsage& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t DiskUsage::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -663,7 +801,7 @@ uint32_t DiskUsage::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t DiskUsage::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("DiskUsage");
 
   xfer += oprot->writeFieldBegin("tables", ::apache::thrift::protocol::T_LIST, 1);
@@ -725,10 +863,16 @@ void KeyValue::__set_key(const Key& val) {
 void KeyValue::__set_value(const std::string& val) {
   this->value = val;
 }
+std::ostream& operator<<(std::ostream& out, const KeyValue& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t KeyValue::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -777,7 +921,7 @@ uint32_t KeyValue::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t KeyValue::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("KeyValue");
 
   xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -831,10 +975,16 @@ void ScanResult::__set_results(const std::vector<KeyValue> & val) {
 void ScanResult::__set_more(const bool val) {
   this->more = val;
 }
+std::ostream& operator<<(std::ostream& out, const ScanResult& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ScanResult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -895,7 +1045,7 @@ uint32_t ScanResult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ScanResult::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ScanResult");
 
   xfer += oprot->writeFieldBegin("results", ::apache::thrift::protocol::T_LIST, 1);
@@ -965,10 +1115,16 @@ void Range::__set_stop(const Key& val) {
 void Range::__set_stopInclusive(const bool val) {
   this->stopInclusive = val;
 }
+std::ostream& operator<<(std::ostream& out, const Range& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Range::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1033,7 +1189,7 @@ uint32_t Range::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t Range::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Range");
 
   xfer += oprot->writeFieldBegin("start", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -1104,10 +1260,16 @@ void ScanColumn::__set_colQualifier(const std::string& val) {
   this->colQualifier = val;
 __isset.colQualifier = true;
 }
+std::ostream& operator<<(std::ostream& out, const ScanColumn& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ScanColumn::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1156,7 +1318,7 @@ uint32_t ScanColumn::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ScanColumn::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ScanColumn");
 
   xfer += oprot->writeFieldBegin("colFamily", ::apache::thrift::protocol::T_STRING, 1);
@@ -1219,10 +1381,16 @@ void IteratorSetting::__set_iteratorClass(const std::string& val) {
 void IteratorSetting::__set_properties(const std::map<std::string, std::string> & val) {
   this->properties = val;
 }
+std::ostream& operator<<(std::ostream& out, const IteratorSetting& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t IteratorSetting::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1302,7 +1470,7 @@ uint32_t IteratorSetting::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t IteratorSetting::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("IteratorSetting");
 
   xfer += oprot->writeFieldBegin("priority", ::apache::thrift::protocol::T_I32, 1);
@@ -1398,10 +1566,16 @@ void ScanOptions::__set_bufferSize(const int32_t val) {
   this->bufferSize = val;
 __isset.bufferSize = true;
 }
+std::ostream& operator<<(std::ostream& out, const ScanOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ScanOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1511,7 +1685,7 @@ uint32_t ScanOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ScanOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ScanOptions");
 
   if (this->__isset.authorizations) {
@@ -1635,10 +1809,16 @@ void BatchScanOptions::__set_threads(const int32_t val) {
   this->threads = val;
 __isset.threads = true;
 }
+std::ostream& operator<<(std::ostream& out, const BatchScanOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t BatchScanOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1760,7 +1940,7 @@ uint32_t BatchScanOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t BatchScanOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("BatchScanOptions");
 
   if (this->__isset.authorizations) {
@@ -1875,10 +2055,16 @@ void KeyValueAndPeek::__set_keyValue(const KeyValue& val) {
 void KeyValueAndPeek::__set_hasNext(const bool val) {
   this->hasNext = val;
 }
+std::ostream& operator<<(std::ostream& out, const KeyValueAndPeek& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t KeyValueAndPeek::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1927,7 +2113,7 @@ uint32_t KeyValueAndPeek::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t KeyValueAndPeek::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("KeyValueAndPeek");
 
   xfer += oprot->writeFieldBegin("keyValue", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -1985,10 +2171,16 @@ void KeyExtent::__set_endRow(const std::string& val) {
 void KeyExtent::__set_prevEndRow(const std::string& val) {
   this->prevEndRow = val;
 }
+std::ostream& operator<<(std::ostream& out, const KeyExtent& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t KeyExtent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2045,7 +2237,7 @@ uint32_t KeyExtent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t KeyExtent::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("KeyExtent");
 
   xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_STRING, 1);
@@ -2111,10 +2303,16 @@ void Column::__set_colQualifier(const std::string& val) {
 void Column::__set_colVisibility(const std::string& val) {
   this->colVisibility = val;
 }
+std::ostream& operator<<(std::ostream& out, const Column& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Column::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2171,7 +2369,7 @@ uint32_t Column::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t Column::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Column");
 
   xfer += oprot->writeFieldBegin("colFamily", ::apache::thrift::protocol::T_STRING, 1);
@@ -2244,10 +2442,16 @@ void Condition::__set_iterators(const std::vector<IteratorSetting> & val) {
   this->iterators = val;
 __isset.iterators = true;
 }
+std::ostream& operator<<(std::ostream& out, const Condition& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Condition::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2324,7 +2528,7 @@ uint32_t Condition::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t Condition::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Condition");
 
   xfer += oprot->writeFieldBegin("column", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -2405,10 +2609,16 @@ void ConditionalUpdates::__set_conditions(const std::vector<Condition> & val) {
 void ConditionalUpdates::__set_updates(const std::vector<ColumnUpdate> & val) {
   this->updates = val;
 }
+std::ostream& operator<<(std::ostream& out, const ConditionalUpdates& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ConditionalUpdates::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2481,7 +2691,7 @@ uint32_t ConditionalUpdates::read(::apache::thrift::protocol::TProtocol* iprot)
 
 uint32_t ConditionalUpdates::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ConditionalUpdates");
 
   xfer += oprot->writeFieldBegin("conditions", ::apache::thrift::protocol::T_LIST, 2);
@@ -2568,10 +2778,16 @@ void ConditionalWriterOptions::__set_durability(const Durability::type val) {
   this->durability = val;
 __isset.durability = true;
 }
+std::ostream& operator<<(std::ostream& out, const ConditionalWriterOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ConditionalWriterOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2659,7 +2875,7 @@ uint32_t ConditionalWriterOptions::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t ConditionalWriterOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ConditionalWriterOptions");
 
   if (this->__isset.maxMemory) {
@@ -2786,10 +3002,16 @@ void ActiveScan::__set_iterators(const std::vector<IteratorSetting> & val) {
 void ActiveScan::__set_authorizations(const std::vector<std::string> & val) {
   this->authorizations = val;
 }
+std::ostream& operator<<(std::ostream& out, const ActiveScan& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ActiveScan::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2950,7 +3172,7 @@ uint32_t ActiveScan::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ActiveScan::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ActiveScan");
 
   xfer += oprot->writeFieldBegin("client", ::apache::thrift::protocol::T_STRING, 1);
@@ -3132,10 +3354,16 @@ void ActiveCompaction::__set_entriesWritten(const int64_t val) {
 void ActiveCompaction::__set_iterators(const std::vector<IteratorSetting> & val) {
   this->iterators = val;
 }
+std::ostream& operator<<(std::ostream& out, const ActiveCompaction& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ActiveCompaction::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3276,7 +3504,7 @@ uint32_t ActiveCompaction::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ActiveCompaction::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ActiveCompaction");
 
   xfer += oprot->writeFieldBegin("extent", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -3423,10 +3651,16 @@ void WriterOptions::__set_durability(const Durability::type val) {
   this->durability = val;
 __isset.durability = true;
 }
+std::ostream& operator<<(std::ostream& out, const WriterOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t WriterOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3501,7 +3735,7 @@ uint32_t WriterOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t WriterOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("WriterOptions");
 
   xfer += oprot->writeFieldBegin("maxMemory", ::apache::thrift::protocol::T_I64, 1);
@@ -3580,10 +3814,16 @@ void CompactionStrategyConfig::__set_className(const std::string& val) {
 void CompactionStrategyConfig::__set_options(const std::map<std::string, std::string> & val) {
   this->options = val;
 }
+std::ostream& operator<<(std::ostream& out, const CompactionStrategyConfig& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t CompactionStrategyConfig::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3647,7 +3887,7 @@ uint32_t CompactionStrategyConfig::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t CompactionStrategyConfig::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("CompactionStrategyConfig");
 
   xfer += oprot->writeFieldBegin("className", ::apache::thrift::protocol::T_STRING, 1);
@@ -3706,10 +3946,16 @@ UnknownScanner::~UnknownScanner() throw() {
 void UnknownScanner::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const UnknownScanner& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t UnknownScanner::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3750,7 +3996,7 @@ uint32_t UnknownScanner::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t UnknownScanner::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("UnknownScanner");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -3803,10 +4049,16 @@ UnknownWriter::~UnknownWriter() throw() {
 void UnknownWriter::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const UnknownWriter& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t UnknownWriter::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3847,7 +4099,7 @@ uint32_t UnknownWriter::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t UnknownWriter::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("UnknownWriter");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -3900,10 +4152,16 @@ NoMoreEntriesException::~NoMoreEntriesException() throw() {
 void NoMoreEntriesException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NoMoreEntriesException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NoMoreEntriesException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3944,7 +4202,7 @@ uint32_t NoMoreEntriesException::read(::apache::thrift::protocol::TProtocol* ipr
 
 uint32_t NoMoreEntriesException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NoMoreEntriesException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -3997,10 +4255,16 @@ AccumuloException::~AccumuloException() throw() {
 void AccumuloException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const AccumuloException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t AccumuloException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4041,7 +4305,7 @@ uint32_t AccumuloException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t AccumuloException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4094,10 +4358,16 @@ AccumuloSecurityException::~AccumuloSecurityException() throw() {
 void AccumuloSecurityException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const AccumuloSecurityException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t AccumuloSecurityException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4138,7 +4408,7 @@ uint32_t AccumuloSecurityException::read(::apache::thrift::protocol::TProtocol*
 
 uint32_t AccumuloSecurityException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloSecurityException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4191,10 +4461,16 @@ TableNotFoundException::~TableNotFoundException() throw() {
 void TableNotFoundException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const TableNotFoundException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t TableNotFoundException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4235,7 +4511,7 @@ uint32_t TableNotFoundException::read(::apache::thrift::protocol::TProtocol* ipr
 
 uint32_t TableNotFoundException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("TableNotFoundException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4288,10 +4564,16 @@ TableExistsException::~TableExistsException() throw() {
 void TableExistsException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const TableExistsException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t TableExistsException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4332,7 +4614,7 @@ uint32_t TableExistsException::read(::apache::thrift::protocol::TProtocol* iprot
 
 uint32_t TableExistsException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("TableExistsException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4385,10 +4667,16 @@ MutationsRejectedException::~MutationsRejectedException() throw() {
 void MutationsRejectedException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const MutationsRejectedException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t MutationsRejectedException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4429,7 +4717,7 @@ uint32_t MutationsRejectedException::read(::apache::thrift::protocol::TProtocol*
 
 uint32_t MutationsRejectedException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("MutationsRejectedException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4482,10 +4770,16 @@ NamespaceExistsException::~NamespaceExistsException() throw() {
 void NamespaceExistsException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NamespaceExistsException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NamespaceExistsException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4526,7 +4820,7 @@ uint32_t NamespaceExistsException::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t NamespaceExistsException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NamespaceExistsException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4579,10 +4873,16 @@ NamespaceNotFoundException::~NamespaceNotFoundException() throw() {
 void NamespaceNotFoundException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NamespaceNotFoundException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NamespaceNotFoundException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4623,7 +4923,7 @@ uint32_t NamespaceNotFoundException::read(::apache::thrift::protocol::TProtocol*
 
 uint32_t NamespaceNotFoundException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NamespaceNotFoundException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4676,10 +4976,16 @@ NamespaceNotEmptyException::~NamespaceNotEmptyException() throw() {
 void NamespaceNotEmptyException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NamespaceNotEmptyException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NamespaceNotEmptyException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4720,7 +5026,7 @@ uint32_t NamespaceNotEmptyException::read(::apache::thrift::protocol::TProtocol*
 
 uint32_t NamespaceNotEmptyException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NamespaceNotEmptyException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
diff --git a/proxy/src/main/cpp/proxy_types.h b/proxy/src/main/cpp/proxy_types.h
index f393d62263..d2ef4fc062 100644
--- a/proxy/src/main/cpp/proxy_types.h
+++ b/proxy/src/main/cpp/proxy_types.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,7 +31,7 @@
 #include <thrift/protocol/TProtocol.h>
 #include <thrift/transport/TTransport.h>
 
-#include <thrift/cxxfunctional.h>
+#include <thrift/stdcxx.h>
 
 
 namespace accumulo {
@@ -49,6 +49,8 @@ struct PartialKey {
 
 extern const std::map<int, const char*> _PartialKey_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const PartialKey::type& val);
+
 struct TablePermission {
   enum type {
     READ = 2,
@@ -62,6 +64,8 @@ struct TablePermission {
 
 extern const std::map<int, const char*> _TablePermission_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const TablePermission::type& val);
+
 struct SystemPermission {
   enum type {
     GRANT = 0,
@@ -81,6 +85,8 @@ struct SystemPermission {
 
 extern const std::map<int, const char*> _SystemPermission_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const SystemPermission::type& val);
+
 struct NamespacePermission {
   enum type {
     READ = 0,
@@ -97,6 +103,8 @@ struct NamespacePermission {
 
 extern const std::map<int, const char*> _NamespacePermission_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const NamespacePermission::type& val);
+
 struct ScanType {
   enum type {
     SINGLE = 0,
@@ -106,6 +114,8 @@ struct ScanType {
 
 extern const std::map<int, const char*> _ScanType_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const ScanType::type& val);
+
 struct ScanState {
   enum type {
     IDLE = 0,
@@ -116,6 +126,8 @@ struct ScanState {
 
 extern const std::map<int, const char*> _ScanState_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const ScanState::type& val);
+
 struct ConditionalStatus {
   enum type {
     ACCEPTED = 0,
@@ -128,6 +140,8 @@ struct ConditionalStatus {
 
 extern const std::map<int, const char*> _ConditionalStatus_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const ConditionalStatus::type& val);
+
 struct Durability {
   enum type {
     DEFAULT = 0,
@@ -140,6 +154,8 @@ struct Durability {
 
 extern const std::map<int, const char*> _Durability_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const Durability::type& val);
+
 struct CompactionType {
   enum type {
     MINOR = 0,
@@ -151,6 +167,8 @@ struct CompactionType {
 
 extern const std::map<int, const char*> _CompactionType_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const CompactionType::type& val);
+
 struct CompactionReason {
   enum type {
     USER = 0,
@@ -163,6 +181,8 @@ struct CompactionReason {
 
 extern const std::map<int, const char*> _CompactionReason_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const CompactionReason::type& val);
+
 struct IteratorScope {
   enum type {
     MINC = 0,
@@ -173,6 +193,8 @@ struct IteratorScope {
 
 extern const std::map<int, const char*> _IteratorScope_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const IteratorScope::type& val);
+
 struct TimeType {
   enum type {
     LOGICAL = 0,
@@ -182,6 +204,8 @@ struct TimeType {
 
 extern const std::map<int, const char*> _TimeType_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const TimeType::type& val);
+
 class Key;
 
 class ColumnUpdate;
@@ -310,11 +334,7 @@ class Key : public virtual ::apache::thrift::TBase {
 
 void swap(Key &a, Key &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Key& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Key& obj);
 
 typedef struct _ColumnUpdate__isset {
   _ColumnUpdate__isset() : colFamily(false), colQualifier(false), colVisibility(false), timestamp(false), value(false), deleteCell(false) {}
@@ -394,11 +414,7 @@ class ColumnUpdate : public virtual ::apache::thrift::TBase {
 
 void swap(ColumnUpdate &a, ColumnUpdate &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ColumnUpdate& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ColumnUpdate& obj);
 
 typedef struct _DiskUsage__isset {
   _DiskUsage__isset() : tables(false), usage(false) {}
@@ -446,11 +462,7 @@ class DiskUsage : public virtual ::apache::thrift::TBase {
 
 void swap(DiskUsage &a, DiskUsage &b);
 
-inline std::ostream& operator<<(std::ostream& out, const DiskUsage& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const DiskUsage& obj);
 
 typedef struct _KeyValue__isset {
   _KeyValue__isset() : key(false), value(false) {}
@@ -498,11 +510,7 @@ class KeyValue : public virtual ::apache::thrift::TBase {
 
 void swap(KeyValue &a, KeyValue &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyValue& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const KeyValue& obj);
 
 typedef struct _ScanResult__isset {
   _ScanResult__isset() : results(false), more(false) {}
@@ -550,11 +558,7 @@ class ScanResult : public virtual ::apache::thrift::TBase {
 
 void swap(ScanResult &a, ScanResult &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ScanResult& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ScanResult& obj);
 
 typedef struct _Range__isset {
   _Range__isset() : start(false), startInclusive(false), stop(false), stopInclusive(false) {}
@@ -614,11 +618,7 @@ class Range : public virtual ::apache::thrift::TBase {
 
 void swap(Range &a, Range &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Range& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Range& obj);
 
 typedef struct _ScanColumn__isset {
   _ScanColumn__isset() : colFamily(false), colQualifier(false) {}
@@ -668,11 +668,7 @@ class ScanColumn : public virtual ::apache::thrift::TBase {
 
 void swap(ScanColumn &a, ScanColumn &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ScanColumn& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ScanColumn& obj);
 
 typedef struct _IteratorSetting__isset {
   _IteratorSetting__isset() : priority(false), name(false), iteratorClass(false), properties(false) {}
@@ -732,11 +728,7 @@ class IteratorSetting : public virtual ::apache::thrift::TBase {
 
 void swap(IteratorSetting &a, IteratorSetting &b);
 
-inline std::ostream& operator<<(std::ostream& out, const IteratorSetting& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const IteratorSetting& obj);
 
 typedef struct _ScanOptions__isset {
   _ScanOptions__isset() : authorizations(false), range(false), columns(false), iterators(false), bufferSize(false) {}
@@ -812,11 +804,7 @@ class ScanOptions : public virtual ::apache::thrift::TBase {
 
 void swap(ScanOptions &a, ScanOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ScanOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ScanOptions& obj);
 
 typedef struct _BatchScanOptions__isset {
   _BatchScanOptions__isset() : authorizations(false), ranges(false), columns(false), iterators(false), threads(false) {}
@@ -892,11 +880,7 @@ class BatchScanOptions : public virtual ::apache::thrift::TBase {
 
 void swap(BatchScanOptions &a, BatchScanOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const BatchScanOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const BatchScanOptions& obj);
 
 typedef struct _KeyValueAndPeek__isset {
   _KeyValueAndPeek__isset() : keyValue(false), hasNext(false) {}
@@ -944,11 +928,7 @@ class KeyValueAndPeek : public virtual ::apache::thrift::TBase {
 
 void swap(KeyValueAndPeek &a, KeyValueAndPeek &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyValueAndPeek& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const KeyValueAndPeek& obj);
 
 typedef struct _KeyExtent__isset {
   _KeyExtent__isset() : tableId(false), endRow(false), prevEndRow(false) {}
@@ -1002,11 +982,7 @@ class KeyExtent : public virtual ::apache::thrift::TBase {
 
 void swap(KeyExtent &a, KeyExtent &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyExtent& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const KeyExtent& obj);
 
 typedef struct _Column__isset {
   _Column__isset() : colFamily(false), colQualifier(false), colVisibility(false) {}
@@ -1060,11 +1036,7 @@ class Column : public virtual ::apache::thrift::TBase {
 
 void swap(Column &a, Column &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Column& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Column& obj);
 
 typedef struct _Condition__isset {
   _Condition__isset() : column(false), timestamp(false), value(false), iterators(false) {}
@@ -1130,11 +1102,7 @@ class Condition : public virtual ::apache::thrift::TBase {
 
 void swap(Condition &a, Condition &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Condition& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Condition& obj);
 
 typedef struct _ConditionalUpdates__isset {
   _ConditionalUpdates__isset() : conditions(false), updates(false) {}
@@ -1182,11 +1150,7 @@ class ConditionalUpdates : public virtual ::apache::thrift::TBase {
 
 void swap(ConditionalUpdates &a, ConditionalUpdates &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ConditionalUpdates& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ConditionalUpdates& obj);
 
 typedef struct _ConditionalWriterOptions__isset {
   _ConditionalWriterOptions__isset() : maxMemory(false), timeoutMs(false), threads(false), authorizations(false), durability(false) {}
@@ -1262,11 +1226,7 @@ class ConditionalWriterOptions : public virtual ::apache::thrift::TBase {
 
 void swap(ConditionalWriterOptions &a, ConditionalWriterOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ConditionalWriterOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ConditionalWriterOptions& obj);
 
 typedef struct _ActiveScan__isset {
   _ActiveScan__isset() : client(false), user(false), table(false), age(false), idleTime(false), type(false), state(false), extent(false), columns(false), iterators(false), authorizations(false) {}
@@ -1368,11 +1328,7 @@ class ActiveScan : public virtual ::apache::thrift::TBase {
 
 void swap(ActiveScan &a, ActiveScan &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ActiveScan& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ActiveScan& obj);
 
 typedef struct _ActiveCompaction__isset {
   _ActiveCompaction__isset() : extent(false), age(false), inputFiles(false), outputFile(false), type(false), reason(false), localityGroup(false), entriesRead(false), entriesWritten(false), iterators(false) {}
@@ -1468,11 +1424,7 @@ class ActiveCompaction : public virtual ::apache::thrift::TBase {
 
 void swap(ActiveCompaction &a, ActiveCompaction &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ActiveCompaction& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ActiveCompaction& obj);
 
 typedef struct _WriterOptions__isset {
   _WriterOptions__isset() : maxMemory(false), latencyMs(false), timeoutMs(false), threads(false), durability(false) {}
@@ -1540,11 +1492,7 @@ class WriterOptions : public virtual ::apache::thrift::TBase {
 
 void swap(WriterOptions &a, WriterOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const WriterOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const WriterOptions& obj);
 
 typedef struct _CompactionStrategyConfig__isset {
   _CompactionStrategyConfig__isset() : className(false), options(false) {}
@@ -1592,11 +1540,7 @@ class CompactionStrategyConfig : public virtual ::apache::thrift::TBase {
 
 void swap(CompactionStrategyConfig &a, CompactionStrategyConfig &b);
 
-inline std::ostream& operator<<(std::ostream& out, const CompactionStrategyConfig& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const CompactionStrategyConfig& obj);
 
 typedef struct _UnknownScanner__isset {
   _UnknownScanner__isset() : msg(false) {}
@@ -1640,11 +1584,7 @@ class UnknownScanner : public ::apache::thrift::TException {
 
 void swap(UnknownScanner &a, UnknownScanner &b);
 
-inline std::ostream& operator<<(std::ostream& out, const UnknownScanner& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const UnknownScanner& obj);
 
 typedef struct _UnknownWriter__isset {
   _UnknownWriter__isset() : msg(false) {}
@@ -1688,11 +1628,7 @@ class UnknownWriter : public ::apache::thrift::TException {
 
 void swap(UnknownWriter &a, UnknownWriter &b);
 
-inline std::ostream& operator<<(std::ostream& out, const UnknownWriter& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const UnknownWriter& obj);
 
 typedef struct _NoMoreEntriesException__isset {
   _NoMoreEntriesException__isset() : msg(false) {}
@@ -1736,11 +1672,7 @@ class NoMoreEntriesException : public ::apache::thrift::TException {
 
 void swap(NoMoreEntriesException &a, NoMoreEntriesException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NoMoreEntriesException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NoMoreEntriesException& obj);
 
 typedef struct _AccumuloException__isset {
   _AccumuloException__isset() : msg(false) {}
@@ -1784,11 +1716,7 @@ class AccumuloException : public ::apache::thrift::TException {
 
 void swap(AccumuloException &a, AccumuloException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const AccumuloException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const AccumuloException& obj);
 
 typedef struct _AccumuloSecurityException__isset {
   _AccumuloSecurityException__isset() : msg(false) {}
@@ -1832,11 +1760,7 @@ class AccumuloSecurityException : public ::apache::thrift::TException {
 
 void swap(AccumuloSecurityException &a, AccumuloSecurityException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const AccumuloSecurityException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const AccumuloSecurityException& obj);
 
 typedef struct _TableNotFoundException__isset {
   _TableNotFoundException__isset() : msg(false) {}
@@ -1880,11 +1804,7 @@ class TableNotFoundException : public ::apache::thrift::TException {
 
 void swap(TableNotFoundException &a, TableNotFoundException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const TableNotFoundException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const TableNotFoundException& obj);
 
 typedef struct _TableExistsException__isset {
   _TableExistsException__isset() : msg(false) {}
@@ -1928,11 +1848,7 @@ class TableExistsException : public ::apache::thrift::TException {
 
 void swap(TableExistsException &a, TableExistsException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const TableExistsException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const TableExistsException& obj);
 
 typedef struct _MutationsRejectedException__isset {
   _MutationsRejectedException__isset() : msg(false) {}
@@ -1976,11 +1892,7 @@ class MutationsRejectedException : public ::apache::thrift::TException {
 
 void swap(MutationsRejectedException &a, MutationsRejectedException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const MutationsRejectedException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const MutationsRejectedException& obj);
 
 typedef struct _NamespaceExistsException__isset {
   _NamespaceExistsException__isset() : msg(false) {}
@@ -2024,11 +1936,7 @@ class NamespaceExistsException : public ::apache::thrift::TException {
 
 void swap(NamespaceExistsException &a, NamespaceExistsException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NamespaceExistsException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NamespaceExistsException& obj);
 
 typedef struct _NamespaceNotFoundException__isset {
   _NamespaceNotFoundException__isset() : msg(false) {}
@@ -2072,11 +1980,7 @@ class NamespaceNotFoundException : public ::apache::thrift::TException {
 
 void swap(NamespaceNotFoundException &a, NamespaceNotFoundException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NamespaceNotFoundException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NamespaceNotFoundException& obj);
 
 typedef struct _NamespaceNotEmptyException__isset {
   _NamespaceNotEmptyException__isset() : msg(false) {}
@@ -2120,11 +2024,7 @@ class NamespaceNotEmptyException : public ::apache::thrift::TException {
 
 void swap(NamespaceNotEmptyException &a, NamespaceNotEmptyException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NamespaceNotEmptyException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NamespaceNotEmptyException& obj);
 
 } // namespace
 
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 6c206c128b..de817f99e1 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -30,11 +30,11 @@
 import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.rpc.SslConnectionParams;
+import org.apache.accumulo.core.trace.wrappers.TraceWrap;
 import org.apache.accumulo.core.util.HostAndPort;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
 import org.apache.accumulo.server.metrics.MetricsFactory;
-import org.apache.accumulo.server.rpc.RpcWrapper;
 import org.apache.accumulo.server.rpc.SaslServerConnectionParams;
 import org.apache.accumulo.server.rpc.ServerAddress;
 import org.apache.accumulo.server.rpc.TServerUtils;
@@ -213,7 +213,7 @@ public static ServerAddress createProxyServer(HostAndPort address,
     ProxyServer impl = new ProxyServer(props);
 
     // Wrap the implementation -- translate some exceptions
-    AccumuloProxy.Iface wrappedImpl = RpcWrapper.service(impl);
+    AccumuloProxy.Iface wrappedImpl = TraceWrap.service(impl);
 
     // Create the processor from the implementation
     TProcessor processor = new AccumuloProxy.Processor<>(wrappedImpl);
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 22926389be..997dc6dd71 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 518146bc7e..23b5b9ad61 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class AccumuloProxy {
 
   public interface Iface {
@@ -434,7 +434,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -7374,6 +7374,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public login_result getResult(I iface, login_args args) throws org.apache.thrift.TException {
         login_result result = new login_result();
         try {
@@ -7398,6 +7403,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public addConstraint_result getResult(I iface, addConstraint_args args) throws org.apache.thrift.TException {
         addConstraint_result result = new addConstraint_result();
         try {
@@ -7427,6 +7437,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public addSplits_result getResult(I iface, addSplits_args args) throws org.apache.thrift.TException {
         addSplits_result result = new addSplits_result();
         try {
@@ -7455,6 +7470,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public attachIterator_result getResult(I iface, attachIterator_args args) throws org.apache.thrift.TException {
         attachIterator_result result = new attachIterator_result();
         try {
@@ -7483,6 +7503,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkIteratorConflicts_result getResult(I iface, checkIteratorConflicts_args args) throws org.apache.thrift.TException {
         checkIteratorConflicts_result result = new checkIteratorConflicts_result();
         try {
@@ -7511,6 +7536,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public clearLocatorCache_result getResult(I iface, clearLocatorCache_args args) throws org.apache.thrift.TException {
         clearLocatorCache_result result = new clearLocatorCache_result();
         try {
@@ -7535,6 +7565,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public cloneTable_result getResult(I iface, cloneTable_args args) throws org.apache.thrift.TException {
         cloneTable_result result = new cloneTable_result();
         try {
@@ -7565,6 +7600,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public compactTable_result getResult(I iface, compactTable_args args) throws org.apache.thrift.TException {
         compactTable_result result = new compactTable_result();
         try {
@@ -7593,6 +7633,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public cancelCompaction_result getResult(I iface, cancelCompaction_args args) throws org.apache.thrift.TException {
         cancelCompaction_result result = new cancelCompaction_result();
         try {
@@ -7621,6 +7666,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createTable_result getResult(I iface, createTable_args args) throws org.apache.thrift.TException {
         createTable_result result = new createTable_result();
         try {
@@ -7649,6 +7699,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public deleteTable_result getResult(I iface, deleteTable_args args) throws org.apache.thrift.TException {
         deleteTable_result result = new deleteTable_result();
         try {
@@ -7677,6 +7732,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public deleteRows_result getResult(I iface, deleteRows_args args) throws org.apache.thrift.TException {
         deleteRows_result result = new deleteRows_result();
         try {
@@ -7705,6 +7765,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public exportTable_result getResult(I iface, exportTable_args args) throws org.apache.thrift.TException {
         exportTable_result result = new exportTable_result();
         try {
@@ -7733,6 +7798,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public flushTable_result getResult(I iface, flushTable_args args) throws org.apache.thrift.TException {
         flushTable_result result = new flushTable_result();
         try {
@@ -7761,6 +7831,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getDiskUsage_result getResult(I iface, getDiskUsage_args args) throws org.apache.thrift.TException {
         getDiskUsage_result result = new getDiskUsage_result();
         try {
@@ -7789,6 +7864,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getLocalityGroups_result getResult(I iface, getLocalityGroups_args args) throws org.apache.thrift.TException {
         getLocalityGroups_result result = new getLocalityGroups_result();
         try {
@@ -7817,6 +7897,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getIteratorSetting_result getResult(I iface, getIteratorSetting_args args) throws org.apache.thrift.TException {
         getIteratorSetting_result result = new getIteratorSetting_result();
         try {
@@ -7845,6 +7930,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getMaxRow_result getResult(I iface, getMaxRow_args args) throws org.apache.thrift.TException {
         getMaxRow_result result = new getMaxRow_result();
         try {
@@ -7873,6 +7963,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTableProperties_result getResult(I iface, getTableProperties_args args) throws org.apache.thrift.TException {
         getTableProperties_result result = new getTableProperties_result();
         try {
@@ -7901,6 +7996,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public importDirectory_result getResult(I iface, importDirectory_args args) throws org.apache.thrift.TException {
         importDirectory_result result = new importDirectory_result();
         try {
@@ -7929,6 +8029,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public importTable_result getResult(I iface, importTable_args args) throws org.apache.thrift.TException {
         importTable_result result = new importTable_result();
         try {
@@ -7957,6 +8062,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listSplits_result getResult(I iface, listSplits_args args) throws org.apache.thrift.TException {
         listSplits_result result = new listSplits_result();
         try {
@@ -7985,6 +8095,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listTables_result getResult(I iface, listTables_args args) throws org.apache.thrift.TException {
         listTables_result result = new listTables_result();
         result.success = iface.listTables(args.login);
@@ -8005,6 +8120,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listIterators_result getResult(I iface, listIterators_args args) throws org.apache.thrift.TException {
         listIterators_result result = new listIterators_result();
         try {
@@ -8033,6 +8153,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listConstraints_result getResult(I iface, listConstraints_args args) throws org.apache.thrift.TException {
         listConstraints_result result = new listConstraints_result();
         try {
@@ -8061,6 +8186,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public mergeTablets_result getResult(I iface, mergeTablets_args args) throws org.apache.thrift.TException {
         mergeTablets_result result = new mergeTablets_result();
         try {
@@ -8089,6 +8219,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public offlineTable_result getResult(I iface, offlineTable_args args) throws org.apache.thrift.TException {
         offlineTable_result result = new offlineTable_result();
         try {
@@ -8117,6 +8252,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public onlineTable_result getResult(I iface, onlineTable_args args) throws org.apache.thrift.TException {
         onlineTable_result result = new onlineTable_result();
         try {
@@ -8145,6 +8285,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeConstraint_result getResult(I iface, removeConstraint_args args) throws org.apache.thrift.TException {
         removeConstraint_result result = new removeConstraint_result();
         try {
@@ -8173,6 +8318,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeIterator_result getResult(I iface, removeIterator_args args) throws org.apache.thrift.TException {
         removeIterator_result result = new removeIterator_result();
         try {
@@ -8201,6 +8351,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeTableProperty_result getResult(I iface, removeTableProperty_args args) throws org.apache.thrift.TException {
         removeTableProperty_result result = new removeTableProperty_result();
         try {
@@ -8229,6 +8384,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public renameTable_result getResult(I iface, renameTable_args args) throws org.apache.thrift.TException {
         renameTable_result result = new renameTable_result();
         try {
@@ -8259,6 +8419,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setLocalityGroups_result getResult(I iface, setLocalityGroups_args args) throws org.apache.thrift.TException {
         setLocalityGroups_result result = new setLocalityGroups_result();
         try {
@@ -8287,6 +8452,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setTableProperty_result getResult(I iface, setTableProperty_args args) throws org.apache.thrift.TException {
         setTableProperty_result result = new setTableProperty_result();
         try {
@@ -8315,6 +8485,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public splitRangeByTablets_result getResult(I iface, splitRangeByTablets_args args) throws org.apache.thrift.TException {
         splitRangeByTablets_result result = new splitRangeByTablets_result();
         try {
@@ -8343,6 +8518,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public tableExists_result getResult(I iface, tableExists_args args) throws org.apache.thrift.TException {
         tableExists_result result = new tableExists_result();
         result.success = iface.tableExists(args.login, args.tableName);
@@ -8364,6 +8544,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public tableIdMap_result getResult(I iface, tableIdMap_args args) throws org.apache.thrift.TException {
         tableIdMap_result result = new tableIdMap_result();
         result.success = iface.tableIdMap(args.login);
@@ -8384,6 +8569,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public testTableClassLoad_result getResult(I iface, testTableClassLoad_args args) throws org.apache.thrift.TException {
         testTableClassLoad_result result = new testTableClassLoad_result();
         try {
@@ -8413,6 +8603,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public pingTabletServer_result getResult(I iface, pingTabletServer_args args) throws org.apache.thrift.TException {
         pingTabletServer_result result = new pingTabletServer_result();
         try {
@@ -8439,6 +8634,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveScans_result getResult(I iface, getActiveScans_args args) throws org.apache.thrift.TException {
         getActiveScans_result result = new getActiveScans_result();
         try {
@@ -8465,6 +8665,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveCompactions_result getResult(I iface, getActiveCompactions_args args) throws org.apache.thrift.TException {
         getActiveCompactions_result result = new getActiveCompactions_result();
         try {
@@ -8491,6 +8696,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getSiteConfiguration_result getResult(I iface, getSiteConfiguration_args args) throws org.apache.thrift.TException {
         getSiteConfiguration_result result = new getSiteConfiguration_result();
         try {
@@ -8517,6 +8727,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getSystemConfiguration_result getResult(I iface, getSystemConfiguration_args args) throws org.apache.thrift.TException {
         getSystemConfiguration_result result = new getSystemConfiguration_result();
         try {
@@ -8543,6 +8758,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTabletServers_result getResult(I iface, getTabletServers_args args) throws org.apache.thrift.TException {
         getTabletServers_result result = new getTabletServers_result();
         result.success = iface.getTabletServers(args.login);
@@ -8563,6 +8783,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeProperty_result getResult(I iface, removeProperty_args args) throws org.apache.thrift.TException {
         removeProperty_result result = new removeProperty_result();
         try {
@@ -8589,6 +8814,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setProperty_result getResult(I iface, setProperty_args args) throws org.apache.thrift.TException {
         setProperty_result result = new setProperty_result();
         try {
@@ -8615,6 +8845,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public testClassLoad_result getResult(I iface, testClassLoad_args args) throws org.apache.thrift.TException {
         testClassLoad_result result = new testClassLoad_result();
         try {
@@ -8642,6 +8877,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public authenticateUser_result getResult(I iface, authenticateUser_args args) throws org.apache.thrift.TException {
         authenticateUser_result result = new authenticateUser_result();
         try {
@@ -8669,6 +8909,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public changeUserAuthorizations_result getResult(I iface, changeUserAuthorizations_args args) throws org.apache.thrift.TException {
         changeUserAuthorizations_result result = new changeUserAuthorizations_result();
         try {
@@ -8695,6 +8940,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public changeLocalUserPassword_result getResult(I iface, changeLocalUserPassword_args args) throws org.apache.thrift.TException {
         changeLocalUserPassword_result result = new changeLocalUserPassword_result();
         try {
@@ -8721,6 +8971,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createLocalUser_result getResult(I iface, createLocalUser_args args) throws org.apache.thrift.TException {
         createLocalUser_result result = new createLocalUser_result();
         try {
@@ -8747,6 +9002,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public dropLocalUser_result getResult(I iface, dropLocalUser_args args) throws org.apache.thrift.TException {
         dropLocalUser_result result = new dropLocalUser_result();
         try {
@@ -8773,6 +9033,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getUserAuthorizations_result getResult(I iface, getUserAuthorizations_args args) throws org.apache.thrift.TException {
         getUserAuthorizations_result result = new getUserAuthorizations_result();
         try {
@@ -8799,6 +9064,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantSystemPermission_result getResult(I iface, grantSystemPermission_args args) throws org.apache.thrift.TException {
         grantSystemPermission_result result = new grantSystemPermission_result();
         try {
@@ -8825,6 +9095,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantTablePermission_result getResult(I iface, grantTablePermission_args args) throws org.apache.thrift.TException {
         grantTablePermission_result result = new grantTablePermission_result();
         try {
@@ -8853,6 +9128,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasSystemPermission_result getResult(I iface, hasSystemPermission_args args) throws org.apache.thrift.TException {
         hasSystemPermission_result result = new hasSystemPermission_result();
         try {
@@ -8880,6 +9160,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasTablePermission_result getResult(I iface, hasTablePermission_args args) throws org.apache.thrift.TException {
         hasTablePermission_result result = new hasTablePermission_result();
         try {
@@ -8909,6 +9194,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listLocalUsers_result getResult(I iface, listLocalUsers_args args) throws org.apache.thrift.TException {
         listLocalUsers_result result = new listLocalUsers_result();
         try {
@@ -8937,6 +9227,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeSystemPermission_result getResult(I iface, revokeSystemPermission_args args) throws org.apache.thrift.TException {
         revokeSystemPermission_result result = new revokeSystemPermission_result();
         try {
@@ -8963,6 +9258,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeTablePermission_result getResult(I iface, revokeTablePermission_args args) throws org.apache.thrift.TException {
         revokeTablePermission_result result = new revokeTablePermission_result();
         try {
@@ -8991,6 +9291,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantNamespacePermission_result getResult(I iface, grantNamespacePermission_args args) throws org.apache.thrift.TException {
         grantNamespacePermission_result result = new grantNamespacePermission_result();
         try {
@@ -9017,6 +9322,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasNamespacePermission_result getResult(I iface, hasNamespacePermission_args args) throws org.apache.thrift.TException {
         hasNamespacePermission_result result = new hasNamespacePermission_result();
         try {
@@ -9044,6 +9354,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeNamespacePermission_result getResult(I iface, revokeNamespacePermission_args args) throws org.apache.thrift.TException {
         revokeNamespacePermission_result result = new revokeNamespacePermission_result();
         try {
@@ -9070,6 +9385,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createBatchScanner_result getResult(I iface, createBatchScanner_args args) throws org.apache.thrift.TException {
         createBatchScanner_result result = new createBatchScanner_result();
         try {
@@ -9098,6 +9418,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createScanner_result getResult(I iface, createScanner_args args) throws org.apache.thrift.TException {
         createScanner_result result = new createScanner_result();
         try {
@@ -9126,6 +9451,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasNext_result getResult(I iface, hasNext_args args) throws org.apache.thrift.TException {
         hasNext_result result = new hasNext_result();
         try {
@@ -9151,6 +9481,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public nextEntry_result getResult(I iface, nextEntry_args args) throws org.apache.thrift.TException {
         nextEntry_result result = new nextEntry_result();
         try {
@@ -9179,6 +9514,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public nextK_result getResult(I iface, nextK_args args) throws org.apache.thrift.TException {
         nextK_result result = new nextK_result();
         try {
@@ -9207,6 +9547,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeScanner_result getResult(I iface, closeScanner_args args) throws org.apache.thrift.TException {
         closeScanner_result result = new closeScanner_result();
         try {
@@ -9231,6 +9576,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public updateAndFlush_result getResult(I iface, updateAndFlush_args args) throws org.apache.thrift.TException {
         updateAndFlush_result result = new updateAndFlush_result();
         try {
@@ -9261,6 +9611,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createWriter_result getResult(I iface, createWriter_args args) throws org.apache.thrift.TException {
         createWriter_result result = new createWriter_result();
         try {
@@ -9289,6 +9644,11 @@ protected boolean isOneway() {
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, update_args args) throws org.apache.thrift.TException {
         iface.update(args.writer, args.cells);
         return null;
@@ -9308,6 +9668,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public flush_result getResult(I iface, flush_args args) throws org.apache.thrift.TException {
         flush_result result = new flush_result();
         try {
@@ -9334,6 +9699,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeWriter_result getResult(I iface, closeWriter_args args) throws org.apache.thrift.TException {
         closeWriter_result result = new closeWriter_result();
         try {
@@ -9360,6 +9730,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public updateRowConditionally_result getResult(I iface, updateRowConditionally_args args) throws org.apache.thrift.TException {
         updateRowConditionally_result result = new updateRowConditionally_result();
         try {
@@ -9388,6 +9763,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createConditionalWriter_result getResult(I iface, createConditionalWriter_args args) throws org.apache.thrift.TException {
         createConditionalWriter_result result = new createConditionalWriter_result();
         try {
@@ -9416,6 +9796,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public updateRowsConditionally_result getResult(I iface, updateRowsConditionally_args args) throws org.apache.thrift.TException {
         updateRowsConditionally_result result = new updateRowsConditionally_result();
         try {
@@ -9444,6 +9829,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeConditionalWriter_result getResult(I iface, closeConditionalWriter_args args) throws org.apache.thrift.TException {
         closeConditionalWriter_result result = new closeConditionalWriter_result();
         iface.closeConditionalWriter(args.conditionalWriter);
@@ -9464,6 +9854,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getRowRange_result getResult(I iface, getRowRange_args args) throws org.apache.thrift.TException {
         getRowRange_result result = new getRowRange_result();
         result.success = iface.getRowRange(args.row);
@@ -9484,6 +9879,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getFollowing_result getResult(I iface, getFollowing_args args) throws org.apache.thrift.TException {
         getFollowing_result result = new getFollowing_result();
         result.success = iface.getFollowing(args.key, args.part);
@@ -9504,6 +9904,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public systemNamespace_result getResult(I iface, systemNamespace_args args) throws org.apache.thrift.TException {
         systemNamespace_result result = new systemNamespace_result();
         result.success = iface.systemNamespace();
@@ -9524,6 +9929,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public defaultNamespace_result getResult(I iface, defaultNamespace_args args) throws org.apache.thrift.TException {
         defaultNamespace_result result = new defaultNamespace_result();
         result.success = iface.defaultNamespace();
@@ -9544,6 +9954,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listNamespaces_result getResult(I iface, listNamespaces_args args) throws org.apache.thrift.TException {
         listNamespaces_result result = new listNamespaces_result();
         try {
@@ -9570,6 +9985,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public namespaceExists_result getResult(I iface, namespaceExists_args args) throws org.apache.thrift.TException {
         namespaceExists_result result = new namespaceExists_result();
         try {
@@ -9597,6 +10017,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createNamespace_result getResult(I iface, createNamespace_args args) throws org.apache.thrift.TException {
         createNamespace_result result = new createNamespace_result();
         try {
@@ -9625,6 +10050,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public deleteNamespace_result getResult(I iface, deleteNamespace_args args) throws org.apache.thrift.TException {
         deleteNamespace_result result = new deleteNamespace_result();
         try {
@@ -9655,6 +10085,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public renameNamespace_result getResult(I iface, renameNamespace_args args) throws org.apache.thrift.TException {
         renameNamespace_result result = new renameNamespace_result();
         try {
@@ -9685,6 +10120,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setNamespaceProperty_result getResult(I iface, setNamespaceProperty_args args) throws org.apache.thrift.TException {
         setNamespaceProperty_result result = new setNamespaceProperty_result();
         try {
@@ -9713,6 +10153,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceProperty_result getResult(I iface, removeNamespaceProperty_args args) throws org.apache.thrift.TException {
         removeNamespaceProperty_result result = new removeNamespaceProperty_result();
         try {
@@ -9741,6 +10186,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getNamespaceProperties_result getResult(I iface, getNamespaceProperties_args args) throws org.apache.thrift.TException {
         getNamespaceProperties_result result = new getNamespaceProperties_result();
         try {
@@ -9769,6 +10219,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public namespaceIdMap_result getResult(I iface, namespaceIdMap_args args) throws org.apache.thrift.TException {
         namespaceIdMap_result result = new namespaceIdMap_result();
         try {
@@ -9795,6 +10250,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public attachNamespaceIterator_result getResult(I iface, attachNamespaceIterator_args args) throws org.apache.thrift.TException {
         attachNamespaceIterator_result result = new attachNamespaceIterator_result();
         try {
@@ -9823,6 +10283,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceIterator_result getResult(I iface, removeNamespaceIterator_args args) throws org.apache.thrift.TException {
         removeNamespaceIterator_result result = new removeNamespaceIterator_result();
         try {
@@ -9851,6 +10316,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getNamespaceIteratorSetting_result getResult(I iface, getNamespaceIteratorSetting_args args) throws org.apache.thrift.TException {
         getNamespaceIteratorSetting_result result = new getNamespaceIteratorSetting_result();
         try {
@@ -9879,6 +10349,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listNamespaceIterators_result getResult(I iface, listNamespaceIterators_args args) throws org.apache.thrift.TException {
         listNamespaceIterators_result result = new listNamespaceIterators_result();
         try {
@@ -9907,6 +10382,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkNamespaceIteratorConflicts_result getResult(I iface, checkNamespaceIteratorConflicts_args args) throws org.apache.thrift.TException {
         checkNamespaceIteratorConflicts_result result = new checkNamespaceIteratorConflicts_result();
         try {
@@ -9935,6 +10415,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public addNamespaceConstraint_result getResult(I iface, addNamespaceConstraint_args args) throws org.apache.thrift.TException {
         addNamespaceConstraint_result result = new addNamespaceConstraint_result();
         try {
@@ -9964,6 +10449,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceConstraint_result getResult(I iface, removeNamespaceConstraint_args args) throws org.apache.thrift.TException {
         removeNamespaceConstraint_result result = new removeNamespaceConstraint_result();
         try {
@@ -9992,6 +10482,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listNamespaceConstraints_result getResult(I iface, listNamespaceConstraints_args args) throws org.apache.thrift.TException {
         listNamespaceConstraints_result result = new listNamespaceConstraints_result();
         try {
@@ -10020,6 +10515,11 @@ protected boolean isOneway() {
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public testNamespaceClassLoad_result getResult(I iface, testNamespaceClassLoad_args args) throws org.apache.thrift.TException {
         testNamespaceClassLoad_result result = new testNamespaceClassLoad_result();
         try {
@@ -20758,7 +21258,7 @@ public attachIterator_args(attachIterator_args other) {
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -20870,7 +21370,7 @@ public int getScopesSize() {
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -21228,12 +21728,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, attachIterator_args
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set182 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set182.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem183;
                   for (int _i184 = 0; _i184 < _set182.size; ++_i184)
                   {
                     _elem183 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem183);
+                    if (_elem183 != null)
+                    {
+                      struct.scopes.add(_elem183);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -21355,12 +21858,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, attachIterator_args
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set187 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set187.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem188;
             for (int _i189 = 0; _i189 < _set187.size; ++_i189)
             {
               _elem188 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem188);
+              if (_elem188 != null)
+              {
+                struct.scopes.add(_elem188);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -22079,7 +22585,7 @@ public checkIteratorConflicts_args(checkIteratorConflicts_args other) {
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -22191,7 +22697,7 @@ public int getScopesSize() {
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -22549,12 +23055,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, checkIteratorConfli
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set190 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set190.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem191;
                   for (int _i192 = 0; _i192 < _set190.size; ++_i192)
                   {
                     _elem191 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem191);
+                    if (_elem191 != null)
+                    {
+                      struct.scopes.add(_elem191);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -22676,12 +23185,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, checkIteratorConflic
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set195 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set195.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem196;
             for (int _i197 = 0; _i197 < _set195.size; ++_i197)
             {
               _elem196 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem196);
+              if (_elem196 != null)
+              {
+                struct.scopes.add(_elem196);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -46886,7 +47398,7 @@ public listIterators_result(listIterators_result other) {
 
           java.lang.String __this__success_copy_key = other_element_key;
 
-          java.util.Set<IteratorScope> __this__success_copy_value = new java.util.HashSet<IteratorScope>(other_element_value.size());
+          java.util.Set<IteratorScope> __this__success_copy_value = java.util.EnumSet.noneOf(IteratorScope.class);
           for (IteratorScope other_element_value_element : other_element_value) {
             __this__success_copy_value.add(other_element_value_element);
           }
@@ -47330,12 +47842,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, listIterators_resul
                     _key293 = iprot.readString();
                     {
                       org.apache.thrift.protocol.TSet _set296 = iprot.readSetBegin();
-                      _val294 = new java.util.HashSet<IteratorScope>(2*_set296.size);
+                      _val294 = java.util.EnumSet.noneOf(IteratorScope.class);
                       IteratorScope _elem297;
                       for (int _i298 = 0; _i298 < _set296.size; ++_i298)
                       {
                         _elem297 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                        _val294.add(_elem297);
+                        if (_elem297 != null)
+                        {
+                          _val294.add(_elem297);
+                        }
                       }
                       iprot.readSetEnd();
                     }
@@ -47498,12 +48013,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, listIterators_result
               _key304 = iprot.readString();
               {
                 org.apache.thrift.protocol.TSet _set307 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-                _val305 = new java.util.HashSet<IteratorScope>(2*_set307.size);
+                _val305 = java.util.EnumSet.noneOf(IteratorScope.class);
                 IteratorScope _elem308;
                 for (int _i309 = 0; _i309 < _set307.size; ++_i309)
                 {
                   _elem308 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                  _val305.add(_elem308);
+                  if (_elem308 != null)
+                  {
+                    _val305.add(_elem308);
+                  }
                 }
               }
               struct.success.put(_key304, _val305);
@@ -53640,7 +54158,7 @@ public removeIterator_args(removeIterator_args other) {
         this.iterName = other.iterName;
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -53752,7 +54270,7 @@ public int getScopesSize() {
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -54106,12 +54624,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeIterator_args
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set320 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set320.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem321;
                   for (int _i322 = 0; _i322 < _set320.size; ++_i322)
                   {
                     _elem321 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem321);
+                    if (_elem321 != null)
+                    {
+                      struct.scopes.add(_elem321);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -54232,12 +54753,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeIterator_args
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set325 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set325.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem326;
             for (int _i327 = 0; _i327 < _set325.size; ++_i327)
             {
               _elem326 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem326);
+              if (_elem326 != null)
+              {
+                struct.scopes.add(_elem326);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -120626,7 +121150,7 @@ public attachNamespaceIterator_args(attachNamespaceIterator_args other) {
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -120738,7 +121262,7 @@ public int getScopesSize() {
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -121096,12 +121620,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, attachNamespaceIter
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set526 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set526.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem527;
                   for (int _i528 = 0; _i528 < _set526.size; ++_i528)
                   {
                     _elem527 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem527);
+                    if (_elem527 != null)
+                    {
+                      struct.scopes.add(_elem527);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -121223,12 +121750,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, attachNamespaceItera
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set531 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set531.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem532;
             for (int _i533 = 0; _i533 < _set531.size; ++_i533)
             {
               _elem532 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem532);
+              if (_elem532 != null)
+              {
+                struct.scopes.add(_elem532);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -121947,7 +122477,7 @@ public removeNamespaceIterator_args(removeNamespaceIterator_args other) {
         this.name = other.name;
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -122059,7 +122589,7 @@ public int getScopesSize() {
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -122413,12 +122943,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceIter
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set534 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set534.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem535;
                   for (int _i536 = 0; _i536 < _set534.size; ++_i536)
                   {
                     _elem535 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem535);
+                    if (_elem535 != null)
+                    {
+                      struct.scopes.add(_elem535);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -122539,12 +123072,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceItera
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set539 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set539.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem540;
             for (int _i541 = 0; _i541 < _set539.size; ++_i541)
             {
               _elem540 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem540);
+              if (_elem540 != null)
+              {
+                struct.scopes.add(_elem540);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -125133,7 +125669,7 @@ public listNamespaceIterators_result(listNamespaceIterators_result other) {
 
           java.lang.String __this__success_copy_key = other_element_key;
 
-          java.util.Set<IteratorScope> __this__success_copy_value = new java.util.HashSet<IteratorScope>(other_element_value.size());
+          java.util.Set<IteratorScope> __this__success_copy_value = java.util.EnumSet.noneOf(IteratorScope.class);
           for (IteratorScope other_element_value_element : other_element_value) {
             __this__success_copy_value.add(other_element_value_element);
           }
@@ -125577,12 +126113,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, listNamespaceIterat
                     _key543 = iprot.readString();
                     {
                       org.apache.thrift.protocol.TSet _set546 = iprot.readSetBegin();
-                      _val544 = new java.util.HashSet<IteratorScope>(2*_set546.size);
+                      _val544 = java.util.EnumSet.noneOf(IteratorScope.class);
                       IteratorScope _elem547;
                       for (int _i548 = 0; _i548 < _set546.size; ++_i548)
                       {
                         _elem547 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                        _val544.add(_elem547);
+                        if (_elem547 != null)
+                        {
+                          _val544.add(_elem547);
+                        }
                       }
                       iprot.readSetEnd();
                     }
@@ -125745,12 +126284,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, listNamespaceIterato
               _key554 = iprot.readString();
               {
                 org.apache.thrift.protocol.TSet _set557 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-                _val555 = new java.util.HashSet<IteratorScope>(2*_set557.size);
+                _val555 = java.util.EnumSet.noneOf(IteratorScope.class);
                 IteratorScope _elem558;
                 for (int _i559 = 0; _i559 < _set557.size; ++_i559)
                 {
                   _elem558 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                  _val555.add(_elem558);
+                  if (_elem558 != null)
+                  {
+                    _val555.add(_elem558);
+                  }
                 }
               }
               struct.success.put(_key554, _val555);
@@ -125911,7 +126453,7 @@ public checkNamespaceIteratorConflicts_args(checkNamespaceIteratorConflicts_args
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -126023,7 +126565,7 @@ public int getScopesSize() {
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -126381,12 +126923,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, checkNamespaceItera
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set560 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set560.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem561;
                   for (int _i562 = 0; _i562 < _set560.size; ++_i562)
                   {
                     _elem561 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem561);
+                    if (_elem561 != null)
+                    {
+                      struct.scopes.add(_elem561);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -126508,12 +127053,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, checkNamespaceIterat
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set565 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set565.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem566;
             for (int _i567 = 0; _i567 < _set565.size; ++_i567)
             {
               _elem566 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem566);
+              if (_elem566 != null)
+              {
+                struct.scopes.add(_elem566);
+              }
             }
           }
           struct.setScopesIsSet(true);
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 7ac823d9b6..79af0df020 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 8ef3a9dc71..8017f323ab 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 66c8cc8627..c7bb09e34b 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 8b9e20fd89..655ff0be53 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 72206371d4..fe5848b7bb 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 f655f46da4..08e8d40f01 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 b4b3255229..06c58127ea 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 03c0688b0e..0260db0fd0 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 da93702d98..d795c25f74 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 ac4aef4bb8..d250574e94 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 6e5c1c34c2..d9e352aca7 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 a5736853b8..5a04964a5c 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 cd3ce5d45f..9ef029fd16 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 f66a93cdaa..306df749a5 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 8f685df84f..dedfcc029c 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 8ab316f5f2..1b151e1835 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 dec8c0a2f3..4061fbb0b9 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 d935c9a0a1..c0963b566a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 8df1b9eec2..d34aef288a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 0f87c093f4..3cd8776344 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 2d121da1d2..c5bd169c72 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 c1532ba7ca..b534c10f69 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 a8148d2fef..eade4b980a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 1927347407..478dd925b3 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 894e0afb2a..1a93e57cf6 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 9a831a401f..a49f127971 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 f28e747b05..8ba03bb924 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 11be665ebc..4958f142f0 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 92c617271c..188a894d8b 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 1eb2b48b07..774c4a06f0 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 08224f9773..dbcbf5f63a 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 f5551cc9f9..a8d1ece1da 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 17d390d255..c186e3fac7 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 0082b717cf..436d6c73db 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 27551a9231..4964ef35e8 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 3162458765..e0729e1374 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 1bc9529d5c..29f622977c 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 c969452297..e63cbd2182 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 26ebb6211b..b04579f48c 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 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 82ea22427a..466f409ee2 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 8a7969c132..c7ad84bf68 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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 25b48a8a54..25e1ddf9c8 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.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/proxy/src/main/python/AccumuloProxy-remote b/proxy/src/main/python/AccumuloProxy-remote
index a98dd670b1..47d7ab96f9 100644
--- a/proxy/src/main/python/AccumuloProxy-remote
+++ b/proxy/src/main/python/AccumuloProxy-remote
@@ -14,7 +14,7 @@
 # limitations under the License.
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
diff --git a/proxy/src/main/python/AccumuloProxy.py b/proxy/src/main/python/AccumuloProxy.py
index ea6e63a144..835a80b55a 100644
--- a/proxy/src/main/python/AccumuloProxy.py
+++ b/proxy/src/main/python/AccumuloProxy.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -22,11 +22,14 @@
 
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
 import sys
 import logging
 from .ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
+all_structs = []
 
 
 class Iface(object):
@@ -4854,14 +4857,18 @@ def process_login(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.login(args.principal, args.loginProperties)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("login", msg_type, seqid)
         result.write(oprot)
@@ -4876,7 +4883,7 @@ def process_addConstraint(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.addConstraint(args.login, args.tableName, args.constraintClassName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4887,9 +4894,13 @@ def process_addConstraint(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("addConstraint", msg_type, seqid)
         result.write(oprot)
@@ -4904,7 +4915,7 @@ def process_addSplits(self, seqid, iprot, oprot):
         try:
             self._handler.addSplits(args.login, args.tableName, args.splits)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4915,9 +4926,13 @@ def process_addSplits(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("addSplits", msg_type, seqid)
         result.write(oprot)
@@ -4932,7 +4947,7 @@ def process_attachIterator(self, seqid, iprot, oprot):
         try:
             self._handler.attachIterator(args.login, args.tableName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4943,9 +4958,13 @@ def process_attachIterator(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("attachIterator", msg_type, seqid)
         result.write(oprot)
@@ -4960,7 +4979,7 @@ def process_checkIteratorConflicts(self, seqid, iprot, oprot):
         try:
             self._handler.checkIteratorConflicts(args.login, args.tableName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4971,9 +4990,13 @@ def process_checkIteratorConflicts(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("checkIteratorConflicts", msg_type, seqid)
         result.write(oprot)
@@ -4988,14 +5011,18 @@ def process_clearLocatorCache(self, seqid, iprot, oprot):
         try:
             self._handler.clearLocatorCache(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except TableNotFoundException as ouch1:
             msg_type = TMessageType.REPLY
             result.ouch1 = ouch1
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("clearLocatorCache", msg_type, seqid)
         result.write(oprot)
@@ -5010,7 +5037,7 @@ def process_cloneTable(self, seqid, iprot, oprot):
         try:
             self._handler.cloneTable(args.login, args.tableName, args.newTableName, args.flush, args.propertiesToSet, args.propertiesToExclude)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5024,9 +5051,13 @@ def process_cloneTable(self, seqid, iprot, oprot):
         except TableExistsException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("cloneTable", msg_type, seqid)
         result.write(oprot)
@@ -5041,7 +5072,7 @@ def process_compactTable(self, seqid, iprot, oprot):
         try:
             self._handler.compactTable(args.login, args.tableName, args.startRow, args.endRow, args.iterators, args.flush, args.wait, args.compactionStrategy)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5052,9 +5083,13 @@ def process_compactTable(self, seqid, iprot, oprot):
         except AccumuloException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("compactTable", msg_type, seqid)
         result.write(oprot)
@@ -5069,7 +5104,7 @@ def process_cancelCompaction(self, seqid, iprot, oprot):
         try:
             self._handler.cancelCompaction(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5080,9 +5115,13 @@ def process_cancelCompaction(self, seqid, iprot, oprot):
         except AccumuloException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("cancelCompaction", msg_type, seqid)
         result.write(oprot)
@@ -5097,7 +5136,7 @@ def process_createTable(self, seqid, iprot, oprot):
         try:
             self._handler.createTable(args.login, args.tableName, args.versioningIter, args.type)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5108,9 +5147,13 @@ def process_createTable(self, seqid, iprot, oprot):
         except TableExistsException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createTable", msg_type, seqid)
         result.write(oprot)
@@ -5125,7 +5168,7 @@ def process_deleteTable(self, seqid, iprot, oprot):
         try:
             self._handler.deleteTable(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5136,9 +5179,13 @@ def process_deleteTable(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("deleteTable", msg_type, seqid)
         result.write(oprot)
@@ -5153,7 +5200,7 @@ def process_deleteRows(self, seqid, iprot, oprot):
         try:
             self._handler.deleteRows(args.login, args.tableName, args.startRow, args.endRow)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5164,9 +5211,13 @@ def process_deleteRows(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("deleteRows", msg_type, seqid)
         result.write(oprot)
@@ -5181,7 +5232,7 @@ def process_exportTable(self, seqid, iprot, oprot):
         try:
             self._handler.exportTable(args.login, args.tableName, args.exportDir)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5192,9 +5243,13 @@ def process_exportTable(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("exportTable", msg_type, seqid)
         result.write(oprot)
@@ -5209,7 +5264,7 @@ def process_flushTable(self, seqid, iprot, oprot):
         try:
             self._handler.flushTable(args.login, args.tableName, args.startRow, args.endRow, args.wait)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5220,9 +5275,13 @@ def process_flushTable(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("flushTable", msg_type, seqid)
         result.write(oprot)
@@ -5237,7 +5296,7 @@ def process_getDiskUsage(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getDiskUsage(args.login, args.tables)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5248,9 +5307,13 @@ def process_getDiskUsage(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getDiskUsage", msg_type, seqid)
         result.write(oprot)
@@ -5265,7 +5328,7 @@ def process_getLocalityGroups(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getLocalityGroups(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5276,9 +5339,13 @@ def process_getLocalityGroups(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getLocalityGroups", msg_type, seqid)
         result.write(oprot)
@@ -5293,7 +5360,7 @@ def process_getIteratorSetting(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getIteratorSetting(args.login, args.tableName, args.iteratorName, args.scope)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5304,9 +5371,13 @@ def process_getIteratorSetting(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getIteratorSetting", msg_type, seqid)
         result.write(oprot)
@@ -5321,7 +5392,7 @@ def process_getMaxRow(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getMaxRow(args.login, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5332,9 +5403,13 @@ def process_getMaxRow(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getMaxRow", msg_type, seqid)
         result.write(oprot)
@@ -5349,7 +5424,7 @@ def process_getTableProperties(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getTableProperties(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5360,9 +5435,13 @@ def process_getTableProperties(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getTableProperties", msg_type, seqid)
         result.write(oprot)
@@ -5377,7 +5456,7 @@ def process_importDirectory(self, seqid, iprot, oprot):
         try:
             self._handler.importDirectory(args.login, args.tableName, args.importDir, args.failureDir, args.setTime)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except TableNotFoundException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5388,9 +5467,13 @@ def process_importDirectory(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("importDirectory", msg_type, seqid)
         result.write(oprot)
@@ -5405,7 +5488,7 @@ def process_importTable(self, seqid, iprot, oprot):
         try:
             self._handler.importTable(args.login, args.tableName, args.importDir)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except TableExistsException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5416,9 +5499,13 @@ def process_importTable(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("importTable", msg_type, seqid)
         result.write(oprot)
@@ -5433,7 +5520,7 @@ def process_listSplits(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listSplits(args.login, args.tableName, args.maxSplits)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5444,9 +5531,13 @@ def process_listSplits(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listSplits", msg_type, seqid)
         result.write(oprot)
@@ -5461,11 +5552,15 @@ def process_listTables(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listTables(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listTables", msg_type, seqid)
         result.write(oprot)
@@ -5480,7 +5575,7 @@ def process_listIterators(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listIterators(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5491,9 +5586,13 @@ def process_listIterators(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listIterators", msg_type, seqid)
         result.write(oprot)
@@ -5508,7 +5607,7 @@ def process_listConstraints(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listConstraints(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5519,9 +5618,13 @@ def process_listConstraints(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listConstraints", msg_type, seqid)
         result.write(oprot)
@@ -5536,7 +5639,7 @@ def process_mergeTablets(self, seqid, iprot, oprot):
         try:
             self._handler.mergeTablets(args.login, args.tableName, args.startRow, args.endRow)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5547,9 +5650,13 @@ def process_mergeTablets(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("mergeTablets", msg_type, seqid)
         result.write(oprot)
@@ -5564,7 +5671,7 @@ def process_offlineTable(self, seqid, iprot, oprot):
         try:
             self._handler.offlineTable(args.login, args.tableName, args.wait)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5575,9 +5682,13 @@ def process_offlineTable(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("offlineTable", msg_type, seqid)
         result.write(oprot)
@@ -5592,7 +5703,7 @@ def process_onlineTable(self, seqid, iprot, oprot):
         try:
             self._handler.onlineTable(args.login, args.tableName, args.wait)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5603,9 +5714,13 @@ def process_onlineTable(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("onlineTable", msg_type, seqid)
         result.write(oprot)
@@ -5620,7 +5735,7 @@ def process_removeConstraint(self, seqid, iprot, oprot):
         try:
             self._handler.removeConstraint(args.login, args.tableName, args.constraint)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5631,9 +5746,13 @@ def process_removeConstraint(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeConstraint", msg_type, seqid)
         result.write(oprot)
@@ -5648,7 +5767,7 @@ def process_removeIterator(self, seqid, iprot, oprot):
         try:
             self._handler.removeIterator(args.login, args.tableName, args.iterName, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5659,9 +5778,13 @@ def process_removeIterator(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeIterator", msg_type, seqid)
         result.write(oprot)
@@ -5676,7 +5799,7 @@ def process_removeTableProperty(self, seqid, iprot, oprot):
         try:
             self._handler.removeTableProperty(args.login, args.tableName, args.property)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5687,9 +5810,13 @@ def process_removeTableProperty(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeTableProperty", msg_type, seqid)
         result.write(oprot)
@@ -5704,7 +5831,7 @@ def process_renameTable(self, seqid, iprot, oprot):
         try:
             self._handler.renameTable(args.login, args.oldTableName, args.newTableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5718,9 +5845,13 @@ def process_renameTable(self, seqid, iprot, oprot):
         except TableExistsException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("renameTable", msg_type, seqid)
         result.write(oprot)
@@ -5735,7 +5866,7 @@ def process_setLocalityGroups(self, seqid, iprot, oprot):
         try:
             self._handler.setLocalityGroups(args.login, args.tableName, args.groups)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5746,9 +5877,13 @@ def process_setLocalityGroups(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setLocalityGroups", msg_type, seqid)
         result.write(oprot)
@@ -5763,7 +5898,7 @@ def process_setTableProperty(self, seqid, iprot, oprot):
         try:
             self._handler.setTableProperty(args.login, args.tableName, args.property, args.value)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5774,9 +5909,13 @@ def process_setTableProperty(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setTableProperty", msg_type, seqid)
         result.write(oprot)
@@ -5791,7 +5930,7 @@ def process_splitRangeByTablets(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.splitRangeByTablets(args.login, args.tableName, args.range, args.maxSplits)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5802,9 +5941,13 @@ def process_splitRangeByTablets(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("splitRangeByTablets", msg_type, seqid)
         result.write(oprot)
@@ -5819,11 +5962,15 @@ def process_tableExists(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.tableExists(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("tableExists", msg_type, seqid)
         result.write(oprot)
@@ -5838,11 +5985,15 @@ def process_tableIdMap(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.tableIdMap(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("tableIdMap", msg_type, seqid)
         result.write(oprot)
@@ -5857,7 +6008,7 @@ def process_testTableClassLoad(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.testTableClassLoad(args.login, args.tableName, args.className, args.asTypeName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5868,9 +6019,13 @@ def process_testTableClassLoad(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("testTableClassLoad", msg_type, seqid)
         result.write(oprot)
@@ -5885,7 +6040,7 @@ def process_pingTabletServer(self, seqid, iprot, oprot):
         try:
             self._handler.pingTabletServer(args.login, args.tserver)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5893,9 +6048,13 @@ def process_pingTabletServer(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("pingTabletServer", msg_type, seqid)
         result.write(oprot)
@@ -5910,7 +6069,7 @@ def process_getActiveScans(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getActiveScans(args.login, args.tserver)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5918,9 +6077,13 @@ def process_getActiveScans(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getActiveScans", msg_type, seqid)
         result.write(oprot)
@@ -5935,7 +6098,7 @@ def process_getActiveCompactions(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getActiveCompactions(args.login, args.tserver)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5943,9 +6106,13 @@ def process_getActiveCompactions(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getActiveCompactions", msg_type, seqid)
         result.write(oprot)
@@ -5960,7 +6127,7 @@ def process_getSiteConfiguration(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getSiteConfiguration(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5968,9 +6135,13 @@ def process_getSiteConfiguration(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getSiteConfiguration", msg_type, seqid)
         result.write(oprot)
@@ -5985,7 +6156,7 @@ def process_getSystemConfiguration(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getSystemConfiguration(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5993,9 +6164,13 @@ def process_getSystemConfiguration(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getSystemConfiguration", msg_type, seqid)
         result.write(oprot)
@@ -6010,11 +6185,15 @@ def process_getTabletServers(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getTabletServers(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getTabletServers", msg_type, seqid)
         result.write(oprot)
@@ -6029,7 +6208,7 @@ def process_removeProperty(self, seqid, iprot, oprot):
         try:
             self._handler.removeProperty(args.login, args.property)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6037,9 +6216,13 @@ def process_removeProperty(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeProperty", msg_type, seqid)
         result.write(oprot)
@@ -6054,7 +6237,7 @@ def process_setProperty(self, seqid, iprot, oprot):
         try:
             self._handler.setProperty(args.login, args.property, args.value)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6062,9 +6245,13 @@ def process_setProperty(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setProperty", msg_type, seqid)
         result.write(oprot)
@@ -6079,7 +6266,7 @@ def process_testClassLoad(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.testClassLoad(args.login, args.className, args.asTypeName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6087,9 +6274,13 @@ def process_testClassLoad(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("testClassLoad", msg_type, seqid)
         result.write(oprot)
@@ -6104,7 +6295,7 @@ def process_authenticateUser(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.authenticateUser(args.login, args.user, args.properties)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6112,9 +6303,13 @@ def process_authenticateUser(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("authenticateUser", msg_type, seqid)
         result.write(oprot)
@@ -6129,7 +6324,7 @@ def process_changeUserAuthorizations(self, seqid, iprot, oprot):
         try:
             self._handler.changeUserAuthorizations(args.login, args.user, args.authorizations)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6137,9 +6332,13 @@ def process_changeUserAuthorizations(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("changeUserAuthorizations", msg_type, seqid)
         result.write(oprot)
@@ -6154,7 +6353,7 @@ def process_changeLocalUserPassword(self, seqid, iprot, oprot):
         try:
             self._handler.changeLocalUserPassword(args.login, args.user, args.password)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6162,9 +6361,13 @@ def process_changeLocalUserPassword(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("changeLocalUserPassword", msg_type, seqid)
         result.write(oprot)
@@ -6179,7 +6382,7 @@ def process_createLocalUser(self, seqid, iprot, oprot):
         try:
             self._handler.createLocalUser(args.login, args.user, args.password)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6187,9 +6390,13 @@ def process_createLocalUser(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createLocalUser", msg_type, seqid)
         result.write(oprot)
@@ -6204,7 +6411,7 @@ def process_dropLocalUser(self, seqid, iprot, oprot):
         try:
             self._handler.dropLocalUser(args.login, args.user)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6212,9 +6419,13 @@ def process_dropLocalUser(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("dropLocalUser", msg_type, seqid)
         result.write(oprot)
@@ -6229,7 +6440,7 @@ def process_getUserAuthorizations(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getUserAuthorizations(args.login, args.user)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6237,9 +6448,13 @@ def process_getUserAuthorizations(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getUserAuthorizations", msg_type, seqid)
         result.write(oprot)
@@ -6254,7 +6469,7 @@ def process_grantSystemPermission(self, seqid, iprot, oprot):
         try:
             self._handler.grantSystemPermission(args.login, args.user, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6262,9 +6477,13 @@ def process_grantSystemPermission(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("grantSystemPermission", msg_type, seqid)
         result.write(oprot)
@@ -6279,7 +6498,7 @@ def process_grantTablePermission(self, seqid, iprot, oprot):
         try:
             self._handler.grantTablePermission(args.login, args.user, args.table, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6290,9 +6509,13 @@ def process_grantTablePermission(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("grantTablePermission", msg_type, seqid)
         result.write(oprot)
@@ -6307,7 +6530,7 @@ def process_hasSystemPermission(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.hasSystemPermission(args.login, args.user, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6315,9 +6538,13 @@ def process_hasSystemPermission(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasSystemPermission", msg_type, seqid)
         result.write(oprot)
@@ -6332,7 +6559,7 @@ def process_hasTablePermission(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.hasTablePermission(args.login, args.user, args.table, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6343,9 +6570,13 @@ def process_hasTablePermission(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasTablePermission", msg_type, seqid)
         result.write(oprot)
@@ -6360,7 +6591,7 @@ def process_listLocalUsers(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listLocalUsers(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6371,9 +6602,13 @@ def process_listLocalUsers(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listLocalUsers", msg_type, seqid)
         result.write(oprot)
@@ -6388,7 +6623,7 @@ def process_revokeSystemPermission(self, seqid, iprot, oprot):
         try:
             self._handler.revokeSystemPermission(args.login, args.user, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6396,9 +6631,13 @@ def process_revokeSystemPermission(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("revokeSystemPermission", msg_type, seqid)
         result.write(oprot)
@@ -6413,7 +6652,7 @@ def process_revokeTablePermission(self, seqid, iprot, oprot):
         try:
             self._handler.revokeTablePermission(args.login, args.user, args.table, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6424,9 +6663,13 @@ def process_revokeTablePermission(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("revokeTablePermission", msg_type, seqid)
         result.write(oprot)
@@ -6441,7 +6684,7 @@ def process_grantNamespacePermission(self, seqid, iprot, oprot):
         try:
             self._handler.grantNamespacePermission(args.login, args.user, args.namespaceName, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6449,9 +6692,13 @@ def process_grantNamespacePermission(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("grantNamespacePermission", msg_type, seqid)
         result.write(oprot)
@@ -6466,7 +6713,7 @@ def process_hasNamespacePermission(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.hasNamespacePermission(args.login, args.user, args.namespaceName, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6474,9 +6721,13 @@ def process_hasNamespacePermission(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasNamespacePermission", msg_type, seqid)
         result.write(oprot)
@@ -6491,7 +6742,7 @@ def process_revokeNamespacePermission(self, seqid, iprot, oprot):
         try:
             self._handler.revokeNamespacePermission(args.login, args.user, args.namespaceName, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6499,9 +6750,13 @@ def process_revokeNamespacePermission(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("revokeNamespacePermission", msg_type, seqid)
         result.write(oprot)
@@ -6516,7 +6771,7 @@ def process_createBatchScanner(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.createBatchScanner(args.login, args.tableName, args.options)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6527,9 +6782,13 @@ def process_createBatchScanner(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createBatchScanner", msg_type, seqid)
         result.write(oprot)
@@ -6544,7 +6803,7 @@ def process_createScanner(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.createScanner(args.login, args.tableName, args.options)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6555,9 +6814,13 @@ def process_createScanner(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createScanner", msg_type, seqid)
         result.write(oprot)
@@ -6572,14 +6835,18 @@ def process_hasNext(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.hasNext(args.scanner)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownScanner as ouch1:
             msg_type = TMessageType.REPLY
             result.ouch1 = ouch1
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasNext", msg_type, seqid)
         result.write(oprot)
@@ -6594,7 +6861,7 @@ def process_nextEntry(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.nextEntry(args.scanner)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except NoMoreEntriesException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6605,9 +6872,13 @@ def process_nextEntry(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("nextEntry", msg_type, seqid)
         result.write(oprot)
@@ -6622,7 +6893,7 @@ def process_nextK(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.nextK(args.scanner, args.k)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except NoMoreEntriesException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6633,9 +6904,13 @@ def process_nextK(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("nextK", msg_type, seqid)
         result.write(oprot)
@@ -6650,14 +6925,18 @@ def process_closeScanner(self, seqid, iprot, oprot):
         try:
             self._handler.closeScanner(args.scanner)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownScanner as ouch1:
             msg_type = TMessageType.REPLY
             result.ouch1 = ouch1
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("closeScanner", msg_type, seqid)
         result.write(oprot)
@@ -6672,7 +6951,7 @@ def process_updateAndFlush(self, seqid, iprot, oprot):
         try:
             self._handler.updateAndFlush(args.login, args.tableName, args.cells)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as outch1:
             msg_type = TMessageType.REPLY
@@ -6686,9 +6965,13 @@ def process_updateAndFlush(self, seqid, iprot, oprot):
         except MutationsRejectedException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("updateAndFlush", msg_type, seqid)
         result.write(oprot)
@@ -6703,7 +6986,7 @@ def process_createWriter(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.createWriter(args.login, args.tableName, args.opts)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as outch1:
             msg_type = TMessageType.REPLY
@@ -6714,9 +6997,13 @@ def process_createWriter(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createWriter", msg_type, seqid)
         result.write(oprot)
@@ -6729,10 +7016,10 @@ def process_update(self, seqid, iprot, oprot):
         iprot.readMessageEnd()
         try:
             self._handler.update(args.writer, args.cells)
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except:
-            pass
+        except Exception:
+            logging.exception('Exception in oneway handler')
 
     def process_flush(self, seqid, iprot, oprot):
         args = flush_args()
@@ -6742,7 +7029,7 @@ def process_flush(self, seqid, iprot, oprot):
         try:
             self._handler.flush(args.writer)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownWriter as ouch1:
             msg_type = TMessageType.REPLY
@@ -6750,9 +7037,13 @@ def process_flush(self, seqid, iprot, oprot):
         except MutationsRejectedException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("flush", msg_type, seqid)
         result.write(oprot)
@@ -6767,7 +7058,7 @@ def process_closeWriter(self, seqid, iprot, oprot):
         try:
             self._handler.closeWriter(args.writer)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownWriter as ouch1:
             msg_type = TMessageType.REPLY
@@ -6775,9 +7066,13 @@ def process_closeWriter(self, seqid, iprot, oprot):
         except MutationsRejectedException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("closeWriter", msg_type, seqid)
         result.write(oprot)
@@ -6792,7 +7087,7 @@ def process_updateRowConditionally(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.updateRowConditionally(args.login, args.tableName, args.row, args.updates)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6803,9 +7098,13 @@ def process_updateRowConditionally(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("updateRowConditionally", msg_type, seqid)
         result.write(oprot)
@@ -6820,7 +7119,7 @@ def process_createConditionalWriter(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.createConditionalWriter(args.login, args.tableName, args.options)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6831,9 +7130,13 @@ def process_createConditionalWriter(self, seqid, iprot, oprot):
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createConditionalWriter", msg_type, seqid)
         result.write(oprot)
@@ -6848,7 +7151,7 @@ def process_updateRowsConditionally(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.updateRowsConditionally(args.conditionalWriter, args.updates)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownWriter as ouch1:
             msg_type = TMessageType.REPLY
@@ -6859,9 +7162,13 @@ def process_updateRowsConditionally(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("updateRowsConditionally", msg_type, seqid)
         result.write(oprot)
@@ -6876,11 +7183,15 @@ def process_closeConditionalWriter(self, seqid, iprot, oprot):
         try:
             self._handler.closeConditionalWriter(args.conditionalWriter)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("closeConditionalWriter", msg_type, seqid)
         result.write(oprot)
@@ -6895,11 +7206,15 @@ def process_getRowRange(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getRowRange(args.row)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getRowRange", msg_type, seqid)
         result.write(oprot)
@@ -6914,11 +7229,15 @@ def process_getFollowing(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getFollowing(args.key, args.part)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getFollowing", msg_type, seqid)
         result.write(oprot)
@@ -6933,11 +7252,15 @@ def process_systemNamespace(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.systemNamespace()
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("systemNamespace", msg_type, seqid)
         result.write(oprot)
@@ -6952,11 +7275,15 @@ def process_defaultNamespace(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.defaultNamespace()
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("defaultNamespace", msg_type, seqid)
         result.write(oprot)
@@ -6971,7 +7298,7 @@ def process_listNamespaces(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listNamespaces(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6979,9 +7306,13 @@ def process_listNamespaces(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listNamespaces", msg_type, seqid)
         result.write(oprot)
@@ -6996,7 +7327,7 @@ def process_namespaceExists(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.namespaceExists(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7004,9 +7335,13 @@ def process_namespaceExists(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("namespaceExists", msg_type, seqid)
         result.write(oprot)
@@ -7021,7 +7356,7 @@ def process_createNamespace(self, seqid, iprot, oprot):
         try:
             self._handler.createNamespace(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7032,9 +7367,13 @@ def process_createNamespace(self, seqid, iprot, oprot):
         except NamespaceExistsException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createNamespace", msg_type, seqid)
         result.write(oprot)
@@ -7049,7 +7388,7 @@ def process_deleteNamespace(self, seqid, iprot, oprot):
         try:
             self._handler.deleteNamespace(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7063,9 +7402,13 @@ def process_deleteNamespace(self, seqid, iprot, oprot):
         except NamespaceNotEmptyException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("deleteNamespace", msg_type, seqid)
         result.write(oprot)
@@ -7080,7 +7423,7 @@ def process_renameNamespace(self, seqid, iprot, oprot):
         try:
             self._handler.renameNamespace(args.login, args.oldNamespaceName, args.newNamespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7094,9 +7437,13 @@ def process_renameNamespace(self, seqid, iprot, oprot):
         except NamespaceExistsException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("renameNamespace", msg_type, seqid)
         result.write(oprot)
@@ -7111,7 +7458,7 @@ def process_setNamespaceProperty(self, seqid, iprot, oprot):
         try:
             self._handler.setNamespaceProperty(args.login, args.namespaceName, args.property, args.value)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7122,9 +7469,13 @@ def process_setNamespaceProperty(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setNamespaceProperty", msg_type, seqid)
         result.write(oprot)
@@ -7139,7 +7490,7 @@ def process_removeNamespaceProperty(self, seqid, iprot, oprot):
         try:
             self._handler.removeNamespaceProperty(args.login, args.namespaceName, args.property)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7150,9 +7501,13 @@ def process_removeNamespaceProperty(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeNamespaceProperty", msg_type, seqid)
         result.write(oprot)
@@ -7167,7 +7522,7 @@ def process_getNamespaceProperties(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getNamespaceProperties(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7178,9 +7533,13 @@ def process_getNamespaceProperties(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getNamespaceProperties", msg_type, seqid)
         result.write(oprot)
@@ -7195,7 +7554,7 @@ def process_namespaceIdMap(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.namespaceIdMap(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7203,9 +7562,13 @@ def process_namespaceIdMap(self, seqid, iprot, oprot):
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("namespaceIdMap", msg_type, seqid)
         result.write(oprot)
@@ -7220,7 +7583,7 @@ def process_attachNamespaceIterator(self, seqid, iprot, oprot):
         try:
             self._handler.attachNamespaceIterator(args.login, args.namespaceName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7231,9 +7594,13 @@ def process_attachNamespaceIterator(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("attachNamespaceIterator", msg_type, seqid)
         result.write(oprot)
@@ -7248,7 +7615,7 @@ def process_removeNamespaceIterator(self, seqid, iprot, oprot):
         try:
             self._handler.removeNamespaceIterator(args.login, args.namespaceName, args.name, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7259,9 +7626,13 @@ def process_removeNamespaceIterator(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeNamespaceIterator", msg_type, seqid)
         result.write(oprot)
@@ -7276,7 +7647,7 @@ def process_getNamespaceIteratorSetting(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.getNamespaceIteratorSetting(args.login, args.namespaceName, args.name, args.scope)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7287,9 +7658,13 @@ def process_getNamespaceIteratorSetting(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getNamespaceIteratorSetting", msg_type, seqid)
         result.write(oprot)
@@ -7304,7 +7679,7 @@ def process_listNamespaceIterators(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listNamespaceIterators(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7315,9 +7690,13 @@ def process_listNamespaceIterators(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listNamespaceIterators", msg_type, seqid)
         result.write(oprot)
@@ -7332,7 +7711,7 @@ def process_checkNamespaceIteratorConflicts(self, seqid, iprot, oprot):
         try:
             self._handler.checkNamespaceIteratorConflicts(args.login, args.namespaceName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7343,9 +7722,13 @@ def process_checkNamespaceIteratorConflicts(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("checkNamespaceIteratorConflicts", msg_type, seqid)
         result.write(oprot)
@@ -7360,7 +7743,7 @@ def process_addNamespaceConstraint(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.addNamespaceConstraint(args.login, args.namespaceName, args.constraintClassName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7371,9 +7754,13 @@ def process_addNamespaceConstraint(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("addNamespaceConstraint", msg_type, seqid)
         result.write(oprot)
@@ -7388,7 +7775,7 @@ def process_removeNamespaceConstraint(self, seqid, iprot, oprot):
         try:
             self._handler.removeNamespaceConstraint(args.login, args.namespaceName, args.id)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7399,9 +7786,13 @@ def process_removeNamespaceConstraint(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeNamespaceConstraint", msg_type, seqid)
         result.write(oprot)
@@ -7416,7 +7807,7 @@ def process_listNamespaceConstraints(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.listNamespaceConstraints(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7427,9 +7818,13 @@ def process_listNamespaceConstraints(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listNamespaceConstraints", msg_type, seqid)
         result.write(oprot)
@@ -7444,7 +7839,7 @@ def process_testNamespaceClassLoad(self, seqid, iprot, oprot):
         try:
             result.success = self._handler.testNamespaceClassLoad(args.login, args.namespaceName, args.className, args.asTypeName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7455,9 +7850,13 @@ def process_testNamespaceClassLoad(self, seqid, iprot, oprot):
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("testNamespaceClassLoad", msg_type, seqid)
         result.write(oprot)
@@ -7474,11 +7873,6 @@ class login_args(object):
      - loginProperties
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'principal', 'UTF8', None, ),  # 1
-        (2, TType.MAP, 'loginProperties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 2
-    )
 
     def __init__(self, principal=None, loginProperties=None,):
         self.principal = principal
@@ -7486,7 +7880,7 @@ def __init__(self, principal=None, loginProperties=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7516,7 +7910,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('login_args')
         if self.principal is not None:
@@ -7547,6 +7941,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(login_args)
+login_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'principal', 'UTF8', None, ),  # 1
+    (2, TType.MAP, 'loginProperties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 2
+)
 
 
 class login_result(object):
@@ -7556,10 +7956,6 @@ class login_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
-        (1, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-    )
 
     def __init__(self, success=None, ouch2=None,):
         self.success = success
@@ -7567,7 +7963,7 @@ def __init__(self, success=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7592,7 +7988,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('login_result')
         if self.success is not None:
@@ -7619,6 +8015,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(login_result)
+login_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
+    (1, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 1
+)
 
 
 class addConstraint_args(object):
@@ -7629,12 +8030,6 @@ class addConstraint_args(object):
      - constraintClassName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'constraintClassName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, constraintClassName=None,):
         self.login = login
@@ -7643,7 +8038,7 @@ def __init__(self, login=None, tableName=None, constraintClassName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7672,7 +8067,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addConstraint_args')
         if self.login is not None:
@@ -7703,6 +8098,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addConstraint_args)
+addConstraint_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'constraintClassName', 'UTF8', None, ),  # 3
+)
 
 
 class addConstraint_result(object):
@@ -7714,12 +8116,6 @@ class addConstraint_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.I32, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -7729,7 +8125,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7766,7 +8162,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addConstraint_result')
         if self.success is not None:
@@ -7801,6 +8197,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addConstraint_result)
+addConstraint_result.thrift_spec = (
+    (0, TType.I32, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class addSplits_args(object):
@@ -7811,12 +8214,6 @@ class addSplits_args(object):
      - splits
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.SET, 'splits', (TType.STRING, 'BINARY', False), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, splits=None,):
         self.login = login
@@ -7825,7 +8222,7 @@ def __init__(self, login=None, tableName=None, splits=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7859,7 +8256,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addSplits_args')
         if self.login is not None:
@@ -7893,6 +8290,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addSplits_args)
+addSplits_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.SET, 'splits', (TType.STRING, 'BINARY', False), None, ),  # 3
+)
 
 
 class addSplits_result(object):
@@ -7903,12 +8307,6 @@ class addSplits_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -7917,7 +8315,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7949,7 +8347,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addSplits_result')
         if self.ouch1 is not None:
@@ -7980,6 +8378,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addSplits_result)
+addSplits_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class attachIterator_args(object):
@@ -7991,13 +8396,6 @@ class attachIterator_args(object):
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'setting', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, setting=None, scopes=None,):
         self.login = login
@@ -8007,7 +8405,7 @@ def __init__(self, login=None, tableName=None, setting=None, scopes=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8047,7 +8445,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('attachIterator_args')
         if self.login is not None:
@@ -8085,6 +8483,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(attachIterator_args)
+attachIterator_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class attachIterator_result(object):
@@ -8095,12 +8501,6 @@ class attachIterator_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -8109,7 +8509,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8141,7 +8541,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('attachIterator_result')
         if self.ouch1 is not None:
@@ -8172,6 +8572,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(attachIterator_result)
+attachIterator_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class checkIteratorConflicts_args(object):
@@ -8183,13 +8590,6 @@ class checkIteratorConflicts_args(object):
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'setting', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, setting=None, scopes=None,):
         self.login = login
@@ -8199,7 +8599,7 @@ def __init__(self, login=None, tableName=None, setting=None, scopes=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8239,7 +8639,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('checkIteratorConflicts_args')
         if self.login is not None:
@@ -8277,6 +8677,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(checkIteratorConflicts_args)
+checkIteratorConflicts_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class checkIteratorConflicts_result(object):
@@ -8287,12 +8695,6 @@ class checkIteratorConflicts_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -8301,7 +8703,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8333,7 +8735,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('checkIteratorConflicts_result')
         if self.ouch1 is not None:
@@ -8364,6 +8766,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(checkIteratorConflicts_result)
+checkIteratorConflicts_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class clearLocatorCache_args(object):
@@ -8373,11 +8782,6 @@ class clearLocatorCache_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -8385,7 +8789,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8409,7 +8813,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('clearLocatorCache_args')
         if self.login is not None:
@@ -8436,6 +8840,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(clearLocatorCache_args)
+clearLocatorCache_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class clearLocatorCache_result(object):
@@ -8444,17 +8854,13 @@ class clearLocatorCache_result(object):
      - ouch1
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 1
-    )
 
     def __init__(self, ouch1=None,):
         self.ouch1 = ouch1
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8474,7 +8880,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('clearLocatorCache_result')
         if self.ouch1 is not None:
@@ -8497,6 +8903,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(clearLocatorCache_result)
+clearLocatorCache_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [TableNotFoundException, None], None, ),  # 1
+)
 
 
 class cloneTable_args(object):
@@ -8510,15 +8921,6 @@ class cloneTable_args(object):
      - propertiesToExclude
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
-        (4, TType.BOOL, 'flush', None, None, ),  # 4
-        (5, TType.MAP, 'propertiesToSet', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 5
-        (6, TType.SET, 'propertiesToExclude', (TType.STRING, 'UTF8', False), None, ),  # 6
-    )
 
     def __init__(self, login=None, tableName=None, newTableName=None, flush=None, propertiesToSet=None, propertiesToExclude=None,):
         self.login = login
@@ -8530,7 +8932,7 @@ def __init__(self, login=None, tableName=None, newTableName=None, flush=None, pr
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8585,7 +8987,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cloneTable_args')
         if self.login is not None:
@@ -8635,6 +9037,16 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cloneTable_args)
+cloneTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
+    (4, TType.BOOL, 'flush', None, None, ),  # 4
+    (5, TType.MAP, 'propertiesToSet', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 5
+    (6, TType.SET, 'propertiesToExclude', (TType.STRING, 'UTF8', False), None, ),  # 6
+)
 
 
 class cloneTable_result(object):
@@ -8646,13 +9058,6 @@ class cloneTable_result(object):
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -8662,7 +9067,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8700,7 +9105,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cloneTable_result')
         if self.ouch1 is not None:
@@ -8735,6 +9140,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cloneTable_result)
+cloneTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [TableExistsException, None], None, ),  # 4
+)
 
 
 class compactTable_args(object):
@@ -8750,17 +9163,6 @@ class compactTable_args(object):
      - compactionStrategy
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-        (5, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 5
-        (6, TType.BOOL, 'flush', None, None, ),  # 6
-        (7, TType.BOOL, 'wait', None, None, ),  # 7
-        (8, TType.STRUCT, 'compactionStrategy', (CompactionStrategyConfig, CompactionStrategyConfig.thrift_spec), None, ),  # 8
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None, iterators=None, flush=None, wait=None, compactionStrategy=None,):
         self.login = login
@@ -8774,7 +9176,7 @@ def __init__(self, login=None, tableName=None, startRow=None, endRow=None, itera
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8835,7 +9237,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('compactTable_args')
         if self.login is not None:
@@ -8889,6 +9291,18 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(compactTable_args)
+compactTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+    (5, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 5
+    (6, TType.BOOL, 'flush', None, None, ),  # 6
+    (7, TType.BOOL, 'wait', None, None, ),  # 7
+    (8, TType.STRUCT, 'compactionStrategy', [CompactionStrategyConfig, None], None, ),  # 8
+)
 
 
 class compactTable_result(object):
@@ -8899,12 +9313,6 @@ class compactTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -8913,7 +9321,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8945,7 +9353,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('compactTable_result')
         if self.ouch1 is not None:
@@ -8976,6 +9384,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(compactTable_result)
+compactTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [TableNotFoundException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloException, None], None, ),  # 3
+)
 
 
 class cancelCompaction_args(object):
@@ -8985,11 +9400,6 @@ class cancelCompaction_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -8997,7 +9407,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9021,7 +9431,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cancelCompaction_args')
         if self.login is not None:
@@ -9048,6 +9458,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cancelCompaction_args)
+cancelCompaction_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class cancelCompaction_result(object):
@@ -9058,12 +9474,6 @@ class cancelCompaction_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9072,7 +9482,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9104,7 +9514,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cancelCompaction_result')
         if self.ouch1 is not None:
@@ -9135,6 +9545,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cancelCompaction_result)
+cancelCompaction_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [TableNotFoundException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloException, None], None, ),  # 3
+)
 
 
 class createTable_args(object):
@@ -9146,13 +9563,6 @@ class createTable_args(object):
      - type
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.BOOL, 'versioningIter', None, None, ),  # 3
-        (4, TType.I32, 'type', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, versioningIter=None, type=None,):
         self.login = login
@@ -9162,7 +9572,7 @@ def __init__(self, login=None, tableName=None, versioningIter=None, type=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9196,7 +9606,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createTable_args')
         if self.login is not None:
@@ -9231,6 +9641,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createTable_args)
+createTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.BOOL, 'versioningIter', None, None, ),  # 3
+    (4, TType.I32, 'type', None, None, ),  # 4
+)
 
 
 class createTable_result(object):
@@ -9241,12 +9659,6 @@ class createTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9255,7 +9667,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9287,7 +9699,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createTable_result')
         if self.ouch1 is not None:
@@ -9318,6 +9730,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createTable_result)
+createTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableExistsException, None], None, ),  # 3
+)
 
 
 class deleteTable_args(object):
@@ -9327,11 +9746,6 @@ class deleteTable_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -9339,7 +9753,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9363,7 +9777,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteTable_args')
         if self.login is not None:
@@ -9390,6 +9804,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteTable_args)
+deleteTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class deleteTable_result(object):
@@ -9400,12 +9820,6 @@ class deleteTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9414,7 +9828,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9446,7 +9860,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteTable_result')
         if self.ouch1 is not None:
@@ -9477,6 +9891,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteTable_result)
+deleteTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class deleteRows_args(object):
@@ -9488,13 +9909,6 @@ class deleteRows_args(object):
      - endRow
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None,):
         self.login = login
@@ -9504,7 +9918,7 @@ def __init__(self, login=None, tableName=None, startRow=None, endRow=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9538,7 +9952,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteRows_args')
         if self.login is not None:
@@ -9573,6 +9987,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteRows_args)
+deleteRows_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+)
 
 
 class deleteRows_result(object):
@@ -9583,12 +10005,6 @@ class deleteRows_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9597,7 +10013,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9629,7 +10045,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteRows_result')
         if self.ouch1 is not None:
@@ -9660,6 +10076,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteRows_result)
+deleteRows_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class exportTable_args(object):
@@ -9670,12 +10093,6 @@ class exportTable_args(object):
      - exportDir
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'exportDir', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, exportDir=None,):
         self.login = login
@@ -9684,7 +10101,7 @@ def __init__(self, login=None, tableName=None, exportDir=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9713,7 +10130,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('exportTable_args')
         if self.login is not None:
@@ -9744,6 +10161,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(exportTable_args)
+exportTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'exportDir', 'UTF8', None, ),  # 3
+)
 
 
 class exportTable_result(object):
@@ -9754,12 +10178,6 @@ class exportTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9768,7 +10186,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9800,7 +10218,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('exportTable_result')
         if self.ouch1 is not None:
@@ -9831,6 +10249,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(exportTable_result)
+exportTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class flushTable_args(object):
@@ -9843,14 +10268,6 @@ class flushTable_args(object):
      - wait
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-        (5, TType.BOOL, 'wait', None, None, ),  # 5
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None, wait=None,):
         self.login = login
@@ -9861,7 +10278,7 @@ def __init__(self, login=None, tableName=None, startRow=None, endRow=None, wait=
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9900,7 +10317,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('flushTable_args')
         if self.login is not None:
@@ -9939,6 +10356,15 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(flushTable_args)
+flushTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+    (5, TType.BOOL, 'wait', None, None, ),  # 5
+)
 
 
 class flushTable_result(object):
@@ -9949,12 +10375,6 @@ class flushTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9963,7 +10383,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9995,7 +10415,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('flushTable_result')
         if self.ouch1 is not None:
@@ -10026,6 +10446,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(flushTable_result)
+flushTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getDiskUsage_args(object):
@@ -10035,11 +10462,6 @@ class getDiskUsage_args(object):
      - tables
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.SET, 'tables', (TType.STRING, 'UTF8', False), None, ),  # 2
-    )
 
     def __init__(self, login=None, tables=None,):
         self.login = login
@@ -10047,7 +10469,7 @@ def __init__(self, login=None, tables=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10076,7 +10498,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getDiskUsage_args')
         if self.login is not None:
@@ -10106,6 +10528,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getDiskUsage_args)
+getDiskUsage_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.SET, 'tables', (TType.STRING, 'UTF8', False), None, ),  # 2
+)
 
 
 class getDiskUsage_result(object):
@@ -10117,12 +10545,6 @@ class getDiskUsage_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (DiskUsage, DiskUsage.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10132,7 +10554,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10175,7 +10597,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getDiskUsage_result')
         if self.success is not None:
@@ -10213,6 +10635,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getDiskUsage_result)
+getDiskUsage_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [DiskUsage, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getLocalityGroups_args(object):
@@ -10222,11 +10651,6 @@ class getLocalityGroups_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -10234,7 +10658,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10258,7 +10682,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getLocalityGroups_args')
         if self.login is not None:
@@ -10285,6 +10709,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getLocalityGroups_args)
+getLocalityGroups_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class getLocalityGroups_result(object):
@@ -10296,12 +10726,6 @@ class getLocalityGroups_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10311,7 +10735,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10359,7 +10783,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getLocalityGroups_result')
         if self.success is not None:
@@ -10401,6 +10825,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getLocalityGroups_result)
+getLocalityGroups_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getIteratorSetting_args(object):
@@ -10412,13 +10843,6 @@ class getIteratorSetting_args(object):
      - scope
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'iteratorName', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'scope', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, iteratorName=None, scope=None,):
         self.login = login
@@ -10428,7 +10852,7 @@ def __init__(self, login=None, tableName=None, iteratorName=None, scope=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10462,7 +10886,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getIteratorSetting_args')
         if self.login is not None:
@@ -10497,6 +10921,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getIteratorSetting_args)
+getIteratorSetting_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'iteratorName', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'scope', None, None, ),  # 4
+)
 
 
 class getIteratorSetting_result(object):
@@ -10508,12 +10940,6 @@ class getIteratorSetting_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10523,7 +10949,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10561,7 +10987,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getIteratorSetting_result')
         if self.success is not None:
@@ -10596,6 +11022,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getIteratorSetting_result)
+getIteratorSetting_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [IteratorSetting, None], None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getMaxRow_args(object):
@@ -10610,16 +11043,6 @@ class getMaxRow_args(object):
      - endInclusive
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.SET, 'auths', (TType.STRING, 'BINARY', False), None, ),  # 3
-        (4, TType.STRING, 'startRow', 'BINARY', None, ),  # 4
-        (5, TType.BOOL, 'startInclusive', None, None, ),  # 5
-        (6, TType.STRING, 'endRow', 'BINARY', None, ),  # 6
-        (7, TType.BOOL, 'endInclusive', None, None, ),  # 7
-    )
 
     def __init__(self, login=None, tableName=None, auths=None, startRow=None, startInclusive=None, endRow=None, endInclusive=None,):
         self.login = login
@@ -10632,7 +11055,7 @@ def __init__(self, login=None, tableName=None, auths=None, startRow=None, startI
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10686,7 +11109,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getMaxRow_args')
         if self.login is not None:
@@ -10736,6 +11159,17 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getMaxRow_args)
+getMaxRow_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.SET, 'auths', (TType.STRING, 'BINARY', False), None, ),  # 3
+    (4, TType.STRING, 'startRow', 'BINARY', None, ),  # 4
+    (5, TType.BOOL, 'startInclusive', None, None, ),  # 5
+    (6, TType.STRING, 'endRow', 'BINARY', None, ),  # 6
+    (7, TType.BOOL, 'endInclusive', None, None, ),  # 7
+)
 
 
 class getMaxRow_result(object):
@@ -10747,12 +11181,6 @@ class getMaxRow_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10762,7 +11190,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10799,7 +11227,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getMaxRow_result')
         if self.success is not None:
@@ -10834,6 +11262,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getMaxRow_result)
+getMaxRow_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getTableProperties_args(object):
@@ -10843,11 +11278,6 @@ class getTableProperties_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -10855,7 +11285,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10879,7 +11309,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTableProperties_args')
         if self.login is not None:
@@ -10906,6 +11336,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTableProperties_args)
+getTableProperties_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class getTableProperties_result(object):
@@ -10917,12 +11353,6 @@ class getTableProperties_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10932,7 +11362,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10975,7 +11405,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTableProperties_result')
         if self.success is not None:
@@ -11014,6 +11444,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTableProperties_result)
+getTableProperties_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class importDirectory_args(object):
@@ -11026,14 +11463,6 @@ class importDirectory_args(object):
      - setTime
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'failureDir', 'UTF8', None, ),  # 4
-        (5, TType.BOOL, 'setTime', None, None, ),  # 5
-    )
 
     def __init__(self, login=None, tableName=None, importDir=None, failureDir=None, setTime=None,):
         self.login = login
@@ -11044,7 +11473,7 @@ def __init__(self, login=None, tableName=None, importDir=None, failureDir=None,
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11083,7 +11512,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importDirectory_args')
         if self.login is not None:
@@ -11122,6 +11551,15 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importDirectory_args)
+importDirectory_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'failureDir', 'UTF8', None, ),  # 4
+    (5, TType.BOOL, 'setTime', None, None, ),  # 5
+)
 
 
 class importDirectory_result(object):
@@ -11132,12 +11570,6 @@ class importDirectory_result(object):
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch3', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch4', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -11146,7 +11578,7 @@ def __init__(self, ouch1=None, ouch3=None, ouch4=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11178,7 +11610,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importDirectory_result')
         if self.ouch1 is not None:
@@ -11209,6 +11641,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importDirectory_result)
+importDirectory_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [TableNotFoundException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch3', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch4', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class importTable_args(object):
@@ -11219,12 +11658,6 @@ class importTable_args(object):
      - importDir
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, importDir=None,):
         self.login = login
@@ -11233,7 +11666,7 @@ def __init__(self, login=None, tableName=None, importDir=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11262,7 +11695,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importTable_args')
         if self.login is not None:
@@ -11293,6 +11726,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importTable_args)
+importTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
+)
 
 
 class importTable_result(object):
@@ -11303,12 +11743,6 @@ class importTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -11317,7 +11751,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11349,7 +11783,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importTable_result')
         if self.ouch1 is not None:
@@ -11380,6 +11814,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importTable_result)
+importTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [TableExistsException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class listSplits_args(object):
@@ -11390,12 +11831,6 @@ class listSplits_args(object):
      - maxSplits
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'maxSplits', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, maxSplits=None,):
         self.login = login
@@ -11404,7 +11839,7 @@ def __init__(self, login=None, tableName=None, maxSplits=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11433,7 +11868,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listSplits_args')
         if self.login is not None:
@@ -11464,6 +11899,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listSplits_args)
+listSplits_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'maxSplits', None, None, ),  # 3
+)
 
 
 class listSplits_result(object):
@@ -11475,12 +11917,6 @@ class listSplits_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -11490,7 +11926,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11532,7 +11968,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listSplits_result')
         if self.success is not None:
@@ -11570,6 +12006,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listSplits_result)
+listSplits_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class listTables_args(object):
@@ -11578,17 +12021,13 @@ class listTables_args(object):
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11607,7 +12046,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listTables_args')
         if self.login is not None:
@@ -11630,6 +12069,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listTables_args)
+listTables_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class listTables_result(object):
@@ -11638,16 +12082,13 @@ class listTables_result(object):
      - success
     """
 
-    thrift_spec = (
-        (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11671,7 +12112,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listTables_result')
         if self.success is not None:
@@ -11697,6 +12138,10 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listTables_result)
+listTables_result.thrift_spec = (
+    (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+)
 
 
 class listIterators_args(object):
@@ -11706,11 +12151,6 @@ class listIterators_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -11718,7 +12158,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11742,7 +12182,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listIterators_args')
         if self.login is not None:
@@ -11769,6 +12209,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listIterators_args)
+listIterators_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class listIterators_result(object):
@@ -11780,12 +12226,6 @@ class listIterators_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.I32, None, False), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -11795,7 +12235,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11843,7 +12283,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listIterators_result')
         if self.success is not None:
@@ -11885,6 +12325,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listIterators_result)
+listIterators_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.I32, None, False), False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class listConstraints_args(object):
@@ -11894,11 +12341,6 @@ class listConstraints_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -11906,7 +12348,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11930,7 +12372,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listConstraints_args')
         if self.login is not None:
@@ -11957,6 +12399,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listConstraints_args)
+listConstraints_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class listConstraints_result(object):
@@ -11968,12 +12416,6 @@ class listConstraints_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -11983,7 +12425,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12026,7 +12468,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listConstraints_result')
         if self.success is not None:
@@ -12065,6 +12507,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listConstraints_result)
+listConstraints_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class mergeTablets_args(object):
@@ -12076,13 +12525,6 @@ class mergeTablets_args(object):
      - endRow
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None,):
         self.login = login
@@ -12092,7 +12534,7 @@ def __init__(self, login=None, tableName=None, startRow=None, endRow=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12126,7 +12568,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('mergeTablets_args')
         if self.login is not None:
@@ -12161,6 +12603,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(mergeTablets_args)
+mergeTablets_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+)
 
 
 class mergeTablets_result(object):
@@ -12171,12 +12621,6 @@ class mergeTablets_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12185,7 +12629,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12217,7 +12661,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('mergeTablets_result')
         if self.ouch1 is not None:
@@ -12248,6 +12692,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(mergeTablets_result)
+mergeTablets_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class offlineTable_args(object):
@@ -12258,21 +12709,15 @@ class offlineTable_args(object):
      - wait
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.BOOL, 'wait', None, False, ),  # 3
-    )
 
-    def __init__(self, login=None, tableName=None, wait=thrift_spec[3][4],):
+    def __init__(self, login=None, tableName=None, wait=False,):
         self.login = login
         self.tableName = tableName
         self.wait = wait
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12301,7 +12746,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('offlineTable_args')
         if self.login is not None:
@@ -12332,6 +12777,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(offlineTable_args)
+offlineTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.BOOL, 'wait', None, False, ),  # 3
+)
 
 
 class offlineTable_result(object):
@@ -12342,12 +12794,6 @@ class offlineTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12356,7 +12802,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12388,7 +12834,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('offlineTable_result')
         if self.ouch1 is not None:
@@ -12419,6 +12865,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(offlineTable_result)
+offlineTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class onlineTable_args(object):
@@ -12429,21 +12882,15 @@ class onlineTable_args(object):
      - wait
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.BOOL, 'wait', None, False, ),  # 3
-    )
 
-    def __init__(self, login=None, tableName=None, wait=thrift_spec[3][4],):
+    def __init__(self, login=None, tableName=None, wait=False,):
         self.login = login
         self.tableName = tableName
         self.wait = wait
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12472,7 +12919,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('onlineTable_args')
         if self.login is not None:
@@ -12503,6 +12950,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(onlineTable_args)
+onlineTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.BOOL, 'wait', None, False, ),  # 3
+)
 
 
 class onlineTable_result(object):
@@ -12513,12 +12967,6 @@ class onlineTable_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12527,7 +12975,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12559,7 +13007,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('onlineTable_result')
         if self.ouch1 is not None:
@@ -12590,6 +13038,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(onlineTable_result)
+onlineTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class removeConstraint_args(object):
@@ -12600,12 +13055,6 @@ class removeConstraint_args(object):
      - constraint
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'constraint', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, constraint=None,):
         self.login = login
@@ -12614,7 +13063,7 @@ def __init__(self, login=None, tableName=None, constraint=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12643,7 +13092,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeConstraint_args')
         if self.login is not None:
@@ -12674,6 +13123,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeConstraint_args)
+removeConstraint_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'constraint', None, None, ),  # 3
+)
 
 
 class removeConstraint_result(object):
@@ -12684,12 +13140,6 @@ class removeConstraint_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12698,7 +13148,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12730,7 +13180,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeConstraint_result')
         if self.ouch1 is not None:
@@ -12761,6 +13211,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeConstraint_result)
+removeConstraint_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class removeIterator_args(object):
@@ -12772,13 +13229,6 @@ class removeIterator_args(object):
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'iterName', 'UTF8', None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, iterName=None, scopes=None,):
         self.login = login
@@ -12788,7 +13238,7 @@ def __init__(self, login=None, tableName=None, iterName=None, scopes=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12827,7 +13277,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeIterator_args')
         if self.login is not None:
@@ -12865,6 +13315,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeIterator_args)
+removeIterator_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'iterName', 'UTF8', None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class removeIterator_result(object):
@@ -12875,12 +13333,6 @@ class removeIterator_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12889,7 +13341,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12921,7 +13373,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeIterator_result')
         if self.ouch1 is not None:
@@ -12952,6 +13404,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeIterator_result)
+removeIterator_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class removeTableProperty_args(object):
@@ -12962,12 +13421,6 @@ class removeTableProperty_args(object):
      - property
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, property=None,):
         self.login = login
@@ -12976,7 +13429,7 @@ def __init__(self, login=None, tableName=None, property=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13005,7 +13458,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeTableProperty_args')
         if self.login is not None:
@@ -13036,6 +13489,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeTableProperty_args)
+removeTableProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
+)
 
 
 class removeTableProperty_result(object):
@@ -13046,12 +13506,6 @@ class removeTableProperty_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -13060,7 +13514,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13092,7 +13546,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeTableProperty_result')
         if self.ouch1 is not None:
@@ -13123,6 +13577,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeTableProperty_result)
+removeTableProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class renameTable_args(object):
@@ -13133,12 +13594,6 @@ class renameTable_args(object):
      - newTableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'oldTableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, oldTableName=None, newTableName=None,):
         self.login = login
@@ -13147,7 +13602,7 @@ def __init__(self, login=None, oldTableName=None, newTableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13176,7 +13631,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('renameTable_args')
         if self.login is not None:
@@ -13207,6 +13662,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(renameTable_args)
+renameTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'oldTableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
+)
 
 
 class renameTable_result(object):
@@ -13218,13 +13680,6 @@ class renameTable_result(object):
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -13234,7 +13689,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13272,7 +13727,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('renameTable_result')
         if self.ouch1 is not None:
@@ -13307,6 +13762,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(renameTable_result)
+renameTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [TableExistsException, None], None, ),  # 4
+)
 
 
 class setLocalityGroups_args(object):
@@ -13317,12 +13780,6 @@ class setLocalityGroups_args(object):
      - groups
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.MAP, 'groups', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, groups=None,):
         self.login = login
@@ -13331,7 +13788,7 @@ def __init__(self, login=None, tableName=None, groups=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13371,7 +13828,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setLocalityGroups_args')
         if self.login is not None:
@@ -13409,6 +13866,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setLocalityGroups_args)
+setLocalityGroups_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.MAP, 'groups', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 3
+)
 
 
 class setLocalityGroups_result(object):
@@ -13419,12 +13883,6 @@ class setLocalityGroups_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -13433,7 +13891,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13465,7 +13923,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setLocalityGroups_result')
         if self.ouch1 is not None:
@@ -13496,6 +13954,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setLocalityGroups_result)
+setLocalityGroups_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class setTableProperty_args(object):
@@ -13507,13 +13972,6 @@ class setTableProperty_args(object):
      - value
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'value', 'UTF8', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, property=None, value=None,):
         self.login = login
@@ -13523,7 +13981,7 @@ def __init__(self, login=None, tableName=None, property=None, value=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13557,7 +14015,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setTableProperty_args')
         if self.login is not None:
@@ -13592,6 +14050,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setTableProperty_args)
+setTableProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'value', 'UTF8', None, ),  # 4
+)
 
 
 class setTableProperty_result(object):
@@ -13602,12 +14068,6 @@ class setTableProperty_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -13616,7 +14076,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13648,7 +14108,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setTableProperty_result')
         if self.ouch1 is not None:
@@ -13679,6 +14139,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setTableProperty_result)
+setTableProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class splitRangeByTablets_args(object):
@@ -13690,13 +14157,6 @@ class splitRangeByTablets_args(object):
      - maxSplits
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'range', (Range, Range.thrift_spec), None, ),  # 3
-        (4, TType.I32, 'maxSplits', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, range=None, maxSplits=None,):
         self.login = login
@@ -13706,7 +14166,7 @@ def __init__(self, login=None, tableName=None, range=None, maxSplits=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13741,7 +14201,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('splitRangeByTablets_args')
         if self.login is not None:
@@ -13776,6 +14236,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(splitRangeByTablets_args)
+splitRangeByTablets_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'range', [Range, None], None, ),  # 3
+    (4, TType.I32, 'maxSplits', None, None, ),  # 4
+)
 
 
 class splitRangeByTablets_result(object):
@@ -13787,12 +14255,6 @@ class splitRangeByTablets_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.SET, 'success', (TType.STRUCT, (Range, Range.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -13802,7 +14264,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13845,7 +14307,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('splitRangeByTablets_result')
         if self.success is not None:
@@ -13883,6 +14345,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(splitRangeByTablets_result)
+splitRangeByTablets_result.thrift_spec = (
+    (0, TType.SET, 'success', (TType.STRUCT, [Range, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class tableExists_args(object):
@@ -13892,11 +14361,6 @@ class tableExists_args(object):
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -13904,7 +14368,7 @@ def __init__(self, login=None, tableName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13928,7 +14392,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableExists_args')
         if self.login is not None:
@@ -13955,6 +14419,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableExists_args)
+tableExists_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class tableExists_result(object):
@@ -13963,16 +14433,13 @@ class tableExists_result(object):
      - success
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13991,7 +14458,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableExists_result')
         if self.success is not None:
@@ -14014,6 +14481,10 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableExists_result)
+tableExists_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+)
 
 
 class tableIdMap_args(object):
@@ -14022,17 +14493,13 @@ class tableIdMap_args(object):
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14051,7 +14518,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableIdMap_args')
         if self.login is not None:
@@ -14074,6 +14541,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableIdMap_args)
+tableIdMap_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class tableIdMap_result(object):
@@ -14082,16 +14554,13 @@ class tableIdMap_result(object):
      - success
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14116,7 +14585,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableIdMap_result')
         if self.success is not None:
@@ -14143,6 +14612,10 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableIdMap_result)
+tableIdMap_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+)
 
 
 class testTableClassLoad_args(object):
@@ -14154,13 +14627,6 @@ class testTableClassLoad_args(object):
      - asTypeName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'className', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, className=None, asTypeName=None,):
         self.login = login
@@ -14170,7 +14636,7 @@ def __init__(self, login=None, tableName=None, className=None, asTypeName=None,)
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14204,7 +14670,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testTableClassLoad_args')
         if self.login is not None:
@@ -14239,6 +14705,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testTableClassLoad_args)
+testTableClassLoad_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'className', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 4
+)
 
 
 class testTableClassLoad_result(object):
@@ -14250,12 +14724,6 @@ class testTableClassLoad_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -14265,7 +14733,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14302,7 +14770,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testTableClassLoad_result')
         if self.success is not None:
@@ -14337,6 +14805,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testTableClassLoad_result)
+testTableClassLoad_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class pingTabletServer_args(object):
@@ -14346,11 +14821,6 @@ class pingTabletServer_args(object):
      - tserver
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tserver=None,):
         self.login = login
@@ -14358,7 +14828,7 @@ def __init__(self, login=None, tserver=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14382,7 +14852,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('pingTabletServer_args')
         if self.login is not None:
@@ -14409,6 +14879,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(pingTabletServer_args)
+pingTabletServer_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
+)
 
 
 class pingTabletServer_result(object):
@@ -14418,11 +14894,6 @@ class pingTabletServer_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -14430,7 +14901,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14456,7 +14927,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('pingTabletServer_result')
         if self.ouch1 is not None:
@@ -14483,6 +14954,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(pingTabletServer_result)
+pingTabletServer_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getActiveScans_args(object):
@@ -14492,11 +14969,6 @@ class getActiveScans_args(object):
      - tserver
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tserver=None,):
         self.login = login
@@ -14504,7 +14976,7 @@ def __init__(self, login=None, tserver=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14528,7 +15000,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveScans_args')
         if self.login is not None:
@@ -14555,6 +15027,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveScans_args)
+getActiveScans_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
+)
 
 
 class getActiveScans_result(object):
@@ -14565,11 +15043,6 @@ class getActiveScans_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (ActiveScan, ActiveScan.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -14578,7 +15051,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14615,7 +15088,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveScans_result')
         if self.success is not None:
@@ -14649,6 +15122,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveScans_result)
+getActiveScans_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [ActiveScan, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getActiveCompactions_args(object):
@@ -14658,11 +15137,6 @@ class getActiveCompactions_args(object):
      - tserver
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tserver=None,):
         self.login = login
@@ -14670,7 +15144,7 @@ def __init__(self, login=None, tserver=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14694,7 +15168,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveCompactions_args')
         if self.login is not None:
@@ -14721,6 +15195,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveCompactions_args)
+getActiveCompactions_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
+)
 
 
 class getActiveCompactions_result(object):
@@ -14731,11 +15211,6 @@ class getActiveCompactions_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (ActiveCompaction, ActiveCompaction.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -14744,7 +15219,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14781,7 +15256,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveCompactions_result')
         if self.success is not None:
@@ -14815,6 +15290,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveCompactions_result)
+getActiveCompactions_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [ActiveCompaction, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getSiteConfiguration_args(object):
@@ -14823,17 +15304,13 @@ class getSiteConfiguration_args(object):
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14852,7 +15329,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSiteConfiguration_args')
         if self.login is not None:
@@ -14875,6 +15352,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSiteConfiguration_args)
+getSiteConfiguration_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class getSiteConfiguration_result(object):
@@ -14885,11 +15367,6 @@ class getSiteConfiguration_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -14898,7 +15375,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14935,7 +15412,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSiteConfiguration_result')
         if self.success is not None:
@@ -14970,6 +15447,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSiteConfiguration_result)
+getSiteConfiguration_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getSystemConfiguration_args(object):
@@ -14978,17 +15461,13 @@ class getSystemConfiguration_args(object):
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15007,7 +15486,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSystemConfiguration_args')
         if self.login is not None:
@@ -15030,6 +15509,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSystemConfiguration_args)
+getSystemConfiguration_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class getSystemConfiguration_result(object):
@@ -15040,11 +15524,6 @@ class getSystemConfiguration_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -15053,7 +15532,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15090,7 +15569,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSystemConfiguration_result')
         if self.success is not None:
@@ -15125,6 +15604,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSystemConfiguration_result)
+getSystemConfiguration_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getTabletServers_args(object):
@@ -15133,17 +15618,13 @@ class getTabletServers_args(object):
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15162,7 +15643,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTabletServers_args')
         if self.login is not None:
@@ -15185,6 +15666,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTabletServers_args)
+getTabletServers_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class getTabletServers_result(object):
@@ -15193,16 +15679,13 @@ class getTabletServers_result(object):
      - success
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15226,7 +15709,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTabletServers_result')
         if self.success is not None:
@@ -15252,6 +15735,10 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTabletServers_result)
+getTabletServers_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+)
 
 
 class removeProperty_args(object):
@@ -15261,11 +15748,6 @@ class removeProperty_args(object):
      - property
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, property=None,):
         self.login = login
@@ -15273,7 +15755,7 @@ def __init__(self, login=None, property=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15297,7 +15779,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeProperty_args')
         if self.login is not None:
@@ -15324,6 +15806,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeProperty_args)
+removeProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
+)
 
 
 class removeProperty_result(object):
@@ -15333,11 +15821,6 @@ class removeProperty_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -15345,7 +15828,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15371,7 +15854,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeProperty_result')
         if self.ouch1 is not None:
@@ -15398,6 +15881,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeProperty_result)
+removeProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class setProperty_args(object):
@@ -15408,12 +15897,6 @@ class setProperty_args(object):
      - value
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'value', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, property=None, value=None,):
         self.login = login
@@ -15422,7 +15905,7 @@ def __init__(self, login=None, property=None, value=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15451,7 +15934,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setProperty_args')
         if self.login is not None:
@@ -15482,6 +15965,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setProperty_args)
+setProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'value', 'UTF8', None, ),  # 3
+)
 
 
 class setProperty_result(object):
@@ -15491,11 +15981,6 @@ class setProperty_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -15503,7 +15988,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15529,7 +16014,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setProperty_result')
         if self.ouch1 is not None:
@@ -15556,6 +16041,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setProperty_result)
+setProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class testClassLoad_args(object):
@@ -15566,12 +16057,6 @@ class testClassLoad_args(object):
      - asTypeName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'className', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, className=None, asTypeName=None,):
         self.login = login
@@ -15580,7 +16065,7 @@ def __init__(self, login=None, className=None, asTypeName=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15609,7 +16094,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testClassLoad_args')
         if self.login is not None:
@@ -15640,6 +16125,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testClassLoad_args)
+testClassLoad_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'className', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 3
+)
 
 
 class testClassLoad_result(object):
@@ -15650,11 +16142,6 @@ class testClassLoad_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -15663,7 +16150,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15694,7 +16181,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testClassLoad_result')
         if self.success is not None:
@@ -15725,6 +16212,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testClassLoad_result)
+testClassLoad_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class authenticateUser_args(object):
@@ -15735,12 +16228,6 @@ class authenticateUser_args(object):
      - properties
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, properties=None,):
         self.login = login
@@ -15749,7 +16236,7 @@ def __init__(self, login=None, user=None, properties=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15784,7 +16271,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('authenticateUser_args')
         if self.login is not None:
@@ -15819,6 +16306,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(authenticateUser_args)
+authenticateUser_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 3
+)
 
 
 class authenticateUser_result(object):
@@ -15829,11 +16323,6 @@ class authenticateUser_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -15842,7 +16331,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15873,7 +16362,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('authenticateUser_result')
         if self.success is not None:
@@ -15904,6 +16393,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(authenticateUser_result)
+authenticateUser_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class changeUserAuthorizations_args(object):
@@ -15914,12 +16409,6 @@ class changeUserAuthorizations_args(object):
      - authorizations
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, authorizations=None,):
         self.login = login
@@ -15928,7 +16417,7 @@ def __init__(self, login=None, user=None, authorizations=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15962,7 +16451,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeUserAuthorizations_args')
         if self.login is not None:
@@ -15996,6 +16485,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeUserAuthorizations_args)
+changeUserAuthorizations_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 3
+)
 
 
 class changeUserAuthorizations_result(object):
@@ -16005,11 +16501,6 @@ class changeUserAuthorizations_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16017,7 +16508,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16043,7 +16534,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeUserAuthorizations_result')
         if self.ouch1 is not None:
@@ -16070,6 +16561,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeUserAuthorizations_result)
+changeUserAuthorizations_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class changeLocalUserPassword_args(object):
@@ -16080,12 +16577,6 @@ class changeLocalUserPassword_args(object):
      - password
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, password=None,):
         self.login = login
@@ -16094,7 +16585,7 @@ def __init__(self, login=None, user=None, password=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16123,7 +16614,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeLocalUserPassword_args')
         if self.login is not None:
@@ -16154,6 +16645,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeLocalUserPassword_args)
+changeLocalUserPassword_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
+)
 
 
 class changeLocalUserPassword_result(object):
@@ -16163,11 +16661,6 @@ class changeLocalUserPassword_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16175,7 +16668,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16201,7 +16694,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeLocalUserPassword_result')
         if self.ouch1 is not None:
@@ -16228,6 +16721,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeLocalUserPassword_result)
+changeLocalUserPassword_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class createLocalUser_args(object):
@@ -16238,12 +16737,6 @@ class createLocalUser_args(object):
      - password
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, password=None,):
         self.login = login
@@ -16252,7 +16745,7 @@ def __init__(self, login=None, user=None, password=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16281,7 +16774,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createLocalUser_args')
         if self.login is not None:
@@ -16312,6 +16805,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createLocalUser_args)
+createLocalUser_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
+)
 
 
 class createLocalUser_result(object):
@@ -16321,11 +16821,6 @@ class createLocalUser_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16333,7 +16828,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16359,7 +16854,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createLocalUser_result')
         if self.ouch1 is not None:
@@ -16386,6 +16881,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createLocalUser_result)
+createLocalUser_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class dropLocalUser_args(object):
@@ -16395,11 +16896,6 @@ class dropLocalUser_args(object):
      - user
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, user=None,):
         self.login = login
@@ -16407,7 +16903,7 @@ def __init__(self, login=None, user=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16431,7 +16927,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('dropLocalUser_args')
         if self.login is not None:
@@ -16458,6 +16954,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(dropLocalUser_args)
+dropLocalUser_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+)
 
 
 class dropLocalUser_result(object):
@@ -16467,11 +16969,6 @@ class dropLocalUser_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16479,7 +16976,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16505,7 +17002,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('dropLocalUser_result')
         if self.ouch1 is not None:
@@ -16532,6 +17029,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(dropLocalUser_result)
+dropLocalUser_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getUserAuthorizations_args(object):
@@ -16541,11 +17044,6 @@ class getUserAuthorizations_args(object):
      - user
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, user=None,):
         self.login = login
@@ -16553,7 +17051,7 @@ def __init__(self, login=None, user=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16577,7 +17075,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getUserAuthorizations_args')
         if self.login is not None:
@@ -16604,6 +17102,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getUserAuthorizations_args)
+getUserAuthorizations_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+)
 
 
 class getUserAuthorizations_result(object):
@@ -16614,11 +17118,6 @@ class getUserAuthorizations_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -16627,7 +17126,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16663,7 +17162,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getUserAuthorizations_result')
         if self.success is not None:
@@ -16697,6 +17196,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getUserAuthorizations_result)
+getUserAuthorizations_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class grantSystemPermission_args(object):
@@ -16707,12 +17212,6 @@ class grantSystemPermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'perm', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, perm=None,):
         self.login = login
@@ -16721,7 +17220,7 @@ def __init__(self, login=None, user=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16750,7 +17249,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantSystemPermission_args')
         if self.login is not None:
@@ -16781,6 +17280,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantSystemPermission_args)
+grantSystemPermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'perm', None, None, ),  # 3
+)
 
 
 class grantSystemPermission_result(object):
@@ -16790,11 +17296,6 @@ class grantSystemPermission_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16802,7 +17303,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16828,7 +17329,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantSystemPermission_result')
         if self.ouch1 is not None:
@@ -16855,6 +17356,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantSystemPermission_result)
+grantSystemPermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class grantTablePermission_args(object):
@@ -16866,13 +17373,6 @@ class grantTablePermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, table=None, perm=None,):
         self.login = login
@@ -16882,7 +17382,7 @@ def __init__(self, login=None, user=None, table=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16916,7 +17416,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantTablePermission_args')
         if self.login is not None:
@@ -16951,6 +17451,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantTablePermission_args)
+grantTablePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class grantTablePermission_result(object):
@@ -16961,12 +17469,6 @@ class grantTablePermission_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -16975,7 +17477,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17007,7 +17509,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantTablePermission_result')
         if self.ouch1 is not None:
@@ -17038,6 +17540,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantTablePermission_result)
+grantTablePermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class hasSystemPermission_args(object):
@@ -17048,12 +17557,6 @@ class hasSystemPermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'perm', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, perm=None,):
         self.login = login
@@ -17062,7 +17565,7 @@ def __init__(self, login=None, user=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17091,7 +17594,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasSystemPermission_args')
         if self.login is not None:
@@ -17122,6 +17625,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasSystemPermission_args)
+hasSystemPermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'perm', None, None, ),  # 3
+)
 
 
 class hasSystemPermission_result(object):
@@ -17132,11 +17642,6 @@ class hasSystemPermission_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -17145,7 +17650,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17176,7 +17681,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasSystemPermission_result')
         if self.success is not None:
@@ -17207,6 +17712,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasSystemPermission_result)
+hasSystemPermission_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class hasTablePermission_args(object):
@@ -17218,13 +17729,6 @@ class hasTablePermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, table=None, perm=None,):
         self.login = login
@@ -17234,7 +17738,7 @@ def __init__(self, login=None, user=None, table=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17268,7 +17772,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasTablePermission_args')
         if self.login is not None:
@@ -17303,6 +17807,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasTablePermission_args)
+hasTablePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class hasTablePermission_result(object):
@@ -17314,12 +17826,6 @@ class hasTablePermission_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -17329,7 +17835,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17366,7 +17872,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasTablePermission_result')
         if self.success is not None:
@@ -17401,6 +17907,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasTablePermission_result)
+hasTablePermission_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class listLocalUsers_args(object):
@@ -17409,17 +17922,13 @@ class listLocalUsers_args(object):
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17438,7 +17947,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listLocalUsers_args')
         if self.login is not None:
@@ -17461,6 +17970,11 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listLocalUsers_args)
+listLocalUsers_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class listLocalUsers_result(object):
@@ -17472,12 +17986,6 @@ class listLocalUsers_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -17487,7 +17995,7 @@ def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17529,7 +18037,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listLocalUsers_result')
         if self.success is not None:
@@ -17567,6 +18075,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listLocalUsers_result)
+listLocalUsers_result.thrift_spec = (
+    (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class revokeSystemPermission_args(object):
@@ -17577,12 +18092,6 @@ class revokeSystemPermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'perm', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, perm=None,):
         self.login = login
@@ -17591,7 +18100,7 @@ def __init__(self, login=None, user=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17620,7 +18129,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeSystemPermission_args')
         if self.login is not None:
@@ -17651,6 +18160,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeSystemPermission_args)
+revokeSystemPermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'perm', None, None, ),  # 3
+)
 
 
 class revokeSystemPermission_result(object):
@@ -17660,11 +18176,6 @@ class revokeSystemPermission_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -17672,7 +18183,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17698,7 +18209,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeSystemPermission_result')
         if self.ouch1 is not None:
@@ -17725,6 +18236,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeSystemPermission_result)
+revokeSystemPermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class revokeTablePermission_args(object):
@@ -17736,13 +18253,6 @@ class revokeTablePermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, table=None, perm=None,):
         self.login = login
@@ -17752,7 +18262,7 @@ def __init__(self, login=None, user=None, table=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17786,7 +18296,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeTablePermission_args')
         if self.login is not None:
@@ -17821,6 +18331,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeTablePermission_args)
+revokeTablePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class revokeTablePermission_result(object):
@@ -17831,12 +18349,6 @@ class revokeTablePermission_result(object):
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -17845,7 +18357,7 @@ def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17877,7 +18389,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeTablePermission_result')
         if self.ouch1 is not None:
@@ -17908,6 +18420,13 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeTablePermission_result)
+revokeTablePermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class grantNamespacePermission_args(object):
@@ -17919,13 +18438,6 @@ class grantNamespacePermission_args(object):
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, namespaceName=None, perm=None,):
         self.login = login
@@ -17935,7 +18447,7 @@ def __init__(self, login=None, user=None, namespaceName=None, perm=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17969,7 +18481,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantNamespacePermission_args')
         if self.login is not None:
@@ -18004,6 +18516,14 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantNamespacePermission_args)
+grantNamespacePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class grantNamespacePermission_result(object):
@@ -18013,11 +18533,6 @@ class grantNamespacePermission_result(object):
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -18025,7 +18540,7 @@ def __init__(self, ouch1=None, ouch2=None,):
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18051,7 +18566,7 @@ def read(self, iprot):
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantNamespacePermission_result')
         if self.ouch1 is not None:
@@ -18078,6 +18593,12 @@ def __eq__(self, other):
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantNamespacePermission_result)
+grantNamespacePermission_result.thrift_spec = (
+    None,  # 0

  (This diff was longer than 20,000 lines, and has been truncated...)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services