You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2026/06/08 12:58:20 UTC

(accumulo) branch main updated: Removed old monitor code, ManagerMonitorInfo (#6403)

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

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


The following commit(s) were added to refs/heads/main by this push:
     new f0841e4d46 Removed old monitor code, ManagerMonitorInfo (#6403)
f0841e4d46 is described below

commit f0841e4d46737728723edda2468106a607a23043
Author: Dave Marion <dl...@apache.org>
AuthorDate: Mon Jun 8 08:58:13 2026 -0400

    Removed old monitor code, ManagerMonitorInfo (#6403)
    
    This change removes the old monitor code from the
    Monitor module, removes ManagerMonitorInfo and
    DeadServerList from the Manager, and other related
    code that was unused elsewhere.
---
 .../java/org/apache/accumulo/core/Constants.java   |     1 -
 .../accumulo/core/clientImpl/ClientContext.java    |    11 +-
 .../accumulo/core/lock/ServiceLockPaths.java       |    26 +-
 .../accumulo/core/manager/thrift/DeadServer.java   |   716 --
 .../accumulo/core/manager/thrift/FateService.java  |    76 +-
 .../core/manager/thrift/FateWorkerService.java     |    72 +-
 .../core/manager/thrift/ManagerClientService.java  | 10555 ++++++++-----------
 .../core/manager/thrift/ManagerMonitorInfo.java    |  1445 ---
 .../core/manager/thrift/TFatePartitions.java       |    36 +-
 core/src/main/thrift/manager.thrift                |    28 -
 .../accumulo/core/lock/ServiceLockPathsTest.java   |   126 -
 minicluster/pom.xml                                |     4 -
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   |    21 -
 .../MiniAccumuloClusterImplTest.java               |    45 -
 .../server/manager/state/DeadServerList.java       |   111 -
 .../apache/accumulo/server/util/TableInfoUtil.java |    83 -
 .../java/org/apache/accumulo/manager/Manager.java  |    42 -
 .../manager/ManagerClientServiceHandler.java       |     6 -
 .../manager/tserverOps/ShutdownTServer.java        |     6 -
 .../accumulo/manager/upgrade/Upgrader11to12.java   |     4 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |   444 -
 .../accumulo/monitor/rest/SummaryInformation.java  |    65 -
 .../apache/accumulo/monitor/rest/XMLResource.java  |    84 -
 .../monitor/rest/compactions/CompactionInfo.java   |    50 -
 .../monitor/rest/compactions/Compactions.java      |    42 -
 .../rest/compactions/CompactionsResource.java      |    65 -
 .../monitor/rest/gc/GarbageCollectorResource.java  |    50 -
 .../monitor/rest/gc/GarbageCollectorStats.java     |    59 -
 .../monitor/rest/gc/GarbageCollectorStatus.java    |    49 -
 .../monitor/rest/logs/DeadLoggerInformation.java   |    54 -
 .../monitor/rest/scans/ScanInformation.java        |    48 -
 .../apache/accumulo/monitor/rest/scans/Scans.java  |    42 -
 .../accumulo/monitor/rest/scans/ScansResource.java |    76 -
 .../rest/statistics/StatisticsResource.java        |   151 -
 .../monitor/rest/tables/CompactionsList.java       |    44 -
 .../monitor/rest/tables/CompactionsTypes.java      |    44 -
 .../monitor/rest/tables/TableInformation.java      |   167 -
 .../monitor/rest/tables/TableInformationList.java  |    42 -
 .../monitor/rest/tables/TableNamespace.java        |    52 -
 .../accumulo/monitor/rest/tables/TablesList.java   |    42 -
 .../monitor/rest/tables/TablesResource.java        |   197 -
 .../rest/trace/RecoveryStatusInformation.java      |    60 -
 .../rest/tservers/AllTimeTabletResults.java        |    63 -
 .../monitor/rest/tservers/CurrentOperations.java   |    74 -
 .../rest/tservers/CurrentTabletResults.java        |    44 -
 .../accumulo/monitor/rest/tservers/ServerStat.java |    57 -
 .../monitor/rest/tservers/ServerStats.java         |    42 -
 .../monitor/rest/tservers/TabletServer.java        |    46 -
 .../tservers/TabletServerDetailInformation.java    |    47 -
 .../rest/tservers/TabletServerInformation.java     |   170 -
 .../tservers/TabletServerRecoveryInformation.java  |    50 -
 .../rest/tservers/TabletServerResource.java        |   304 -
 .../monitor/rest/tservers/TabletServerSummary.java |    63 -
 .../monitor/rest/tservers/TabletServers.java       |    52 -
 .../rest/tservers/TabletServersRecovery.java       |    43 -
 .../accumulo/monitor/resources/js/functions.js     |   107 +-
 .../rest/tservers/TabletServerInformationTest.java |   112 -
 .../java/org/apache/accumulo/test/BalanceIT.java   |     4 +-
 .../org/apache/accumulo/test/BrokenBalancerIT.java |     4 +-
 .../accumulo/test/CountNameNodeOpsBulkIT.java      |     5 +-
 .../accumulo/test/DetectDeadTabletServersIT.java   |    35 +-
 .../org/apache/accumulo/test/GetManagerStats.java  |   124 -
 .../functional/BalanceAfterCommsFailureIT.java     |    43 +-
 .../BalanceInPresenceOfOfflineTableIT.java         |    52 +-
 .../test/functional/MetadataMaxFilesIT.java        |    29 +-
 .../test/functional/SimpleBalancerFairnessIT.java  |    64 +-
 66 files changed, 4851 insertions(+), 12124 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java
index bb6e49eda4..b4d8dedfac 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -74,7 +74,6 @@ public class Constants {
   public static final String ZCOMPACTORS = "/compactors";
 
   public static final String ZDEAD = "/dead";
-  public static final String ZDEADTSERVERS = ZDEAD + "/tservers";
 
   public static final String ZSHUTTING_DOWN_TSERVERS = "/shutting-down-tservers";
 
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index a51bcf0d98..33a633af69 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -1327,12 +1327,11 @@ public class ClientContext implements AccumuloClient {
   }
 
   private static Set<String> createPersistentWatcherPaths() {
-    return Set.of(Constants.ZCOMPACTORS, Constants.ZDEADTSERVERS, Constants.ZGC_LOCK,
-        Constants.ZMANAGER_LOCK, Constants.ZMINI_LOCK, Constants.ZMONITOR_LOCK,
-        Constants.ZNAMESPACES, Constants.ZRECOVERY, Constants.ZSSERVERS, Constants.ZTABLES,
-        Constants.ZTSERVERS, Constants.ZUSERS, RootTable.ZROOT_TABLET, Constants.ZTEST_LOCK,
-        Constants.ZMANAGER_ASSISTANT_LOCK, Constants.ZRESOURCEGROUPS,
-        Constants.ZMANAGER_ASSIGNMENTS);
+    return Set.of(Constants.ZCOMPACTORS, Constants.ZGC_LOCK, Constants.ZMANAGER_LOCK,
+        Constants.ZMINI_LOCK, Constants.ZMONITOR_LOCK, Constants.ZNAMESPACES, Constants.ZRECOVERY,
+        Constants.ZSSERVERS, Constants.ZTABLES, Constants.ZTSERVERS, Constants.ZUSERS,
+        RootTable.ZROOT_TABLET, Constants.ZTEST_LOCK, Constants.ZMANAGER_ASSISTANT_LOCK,
+        Constants.ZRESOURCEGROUPS, Constants.ZMANAGER_ASSIGNMENTS);
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java
index 363f3cc402..2bc97fb1f7 100644
--- a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java
+++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java
@@ -104,11 +104,9 @@ public class ServiceLockPaths {
      */
     private ServiceLockPath(String type, ResourceGroupId resourceGroup, HostAndPort server) {
       this.type = requireNonNull(type);
-      Preconditions.checkArgument(
-          this.type.equals(Constants.ZCOMPACTORS) || this.type.equals(Constants.ZSSERVERS)
-              || this.type.equals(Constants.ZTSERVERS) || this.type.equals(Constants.ZDEADTSERVERS)
-              || this.type.equals(Constants.ZMANAGER_ASSISTANT_LOCK),
-          "Unsupported type: " + type);
+      Preconditions.checkArgument(this.type.equals(Constants.ZCOMPACTORS)
+          || this.type.equals(Constants.ZSSERVERS) || this.type.equals(Constants.ZTSERVERS)
+          || this.type.equals(Constants.ZMANAGER_ASSISTANT_LOCK), "Unsupported type: " + type);
       this.resourceGroup = requireNonNull(resourceGroup);
       this.server = requireNonNull(server).toString();
       this.path = this.type + "/" + this.resourceGroup + "/" + this.server;
@@ -186,8 +184,6 @@ public class ServiceLockPaths {
       return Constants.ZCOMPACTORS;
     } else if (pathStartsWith(path, Constants.ZSSERVERS)) {
       return Constants.ZSSERVERS;
-    } else if (pathStartsWith(path, Constants.ZDEADTSERVERS)) {
-      return Constants.ZDEADTSERVERS;
     } else if (pathStartsWith(path, Constants.ZTSERVERS)) {
       return Constants.ZTSERVERS;
     } else {
@@ -223,7 +219,7 @@ public class ServiceLockPaths {
         return switch (type) {
           case Constants.ZMINI_LOCK -> new ServiceLockPath(type, server);
           case Constants.ZCOMPACTORS, Constants.ZSSERVERS, Constants.ZTSERVERS,
-              Constants.ZDEADTSERVERS, Constants.ZMANAGER_ASSISTANT_LOCK ->
+              Constants.ZMANAGER_ASSISTANT_LOCK ->
             new ServiceLockPath(type, ResourceGroupId.of(resourceGroup),
                 HostAndPort.fromString(server));
           default ->
@@ -278,11 +274,6 @@ public class ServiceLockPaths {
     return new ServiceLockPath(Constants.ZTSERVERS, resourceGroup, serverAddress);
   }
 
-  public ServiceLockPath createDeadTabletServerPath(ResourceGroupId resourceGroup,
-      HostAndPort serverAddress) {
-    return new ServiceLockPath(Constants.ZDEADTSERVERS, resourceGroup, serverAddress);
-  }
-
   public ServiceLockPath createAdminLockPath() {
     return new ServiceLockPath(Constants.ZADMIN_LOCK);
   }
@@ -356,11 +347,6 @@ public class ServiceLockPaths {
     return get(Constants.ZTSERVERS, resourceGroupPredicate, address, withLock);
   }
 
-  public Set<ServiceLockPath> getDeadTabletServer(ResourceGroupPredicate resourceGroupPredicate,
-      AddressSelector address, boolean withLock) {
-    return get(Constants.ZDEADTSERVERS, resourceGroupPredicate, address, withLock);
-  }
-
   public interface ResourceGroupPredicate extends Predicate<ResourceGroupId> {
     ResourceGroupPredicate ANY = rgid -> true;
     ResourceGroupPredicate DEFAULT_RG_ONLY = ResourceGroupId.DEFAULT::equals;
@@ -445,7 +431,7 @@ public class ServiceLockPaths {
         }
       }
     } else if (serverType.equals(Constants.ZCOMPACTORS) || serverType.equals(Constants.ZSSERVERS)
-        || serverType.equals(Constants.ZTSERVERS) || serverType.equals(Constants.ZDEADTSERVERS)
+        || serverType.equals(Constants.ZTSERVERS)
         || serverType.equals(Constants.ZMANAGER_ASSISTANT_LOCK)) {
       final List<String> resourceGroups = zooCache.getChildren(typePath);
       for (final String group : resourceGroups) {
@@ -484,7 +470,7 @@ public class ServiceLockPaths {
             if (addressPredicate.test(server)) {
               final ServiceLockPath slp =
                   parse(Optional.of(serverType), typePath + "/" + group + "/" + server);
-              if (!withLock || slp.getType().equals(Constants.ZDEADTSERVERS)) {
+              if (!withLock) {
                 // Dead TServers don't have lock data
                 results.add(slp);
               } else {
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
deleted file mode 100644
index 348185b506..0000000000
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
+++ /dev/null
@@ -1,716 +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
- *
- *   https://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.
- */
-/*
- * Autogenerated by Thrift Compiler (0.17.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.accumulo.core.manager.thrift;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-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");
-
-  private static final org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField LAST_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("lastStatus", org.apache.thrift.protocol.TType.I64, (short)2);
-  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)4);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DeadServerStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DeadServerTupleSchemeFactory();
-
-  public @org.apache.thrift.annotation.Nullable java.lang.String server; // required
-  public long lastStatus; // required
-  public @org.apache.thrift.annotation.Nullable java.lang.String status; // required
-  public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    SERVER((short)1, "server"),
-    LAST_STATUS((short)2, "lastStatus"),
-    STATUS((short)3, "status"),
-    RESOURCE_GROUP((short)4, "resourceGroup");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    @org.apache.thrift.annotation.Nullable
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // SERVER
-          return SERVER;
-        case 2: // LAST_STATUS
-          return LAST_STATUS;
-        case 3: // STATUS
-          return STATUS;
-        case 4: // RESOURCE_GROUP
-          return RESOURCE_GROUP;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    @org.apache.thrift.annotation.Nullable
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    @Override
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    @Override
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __LASTSTATUS_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.SERVER, new org.apache.thrift.meta_data.FieldMetaData("server", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.LAST_STATUS, new org.apache.thrift.meta_data.FieldMetaData("lastStatus", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DeadServer.class, metaDataMap);
-  }
-
-  public DeadServer() {
-  }
-
-  public DeadServer(
-    java.lang.String server,
-    long lastStatus,
-    java.lang.String status,
-    java.lang.String resourceGroup)
-  {
-    this();
-    this.server = server;
-    this.lastStatus = lastStatus;
-    setLastStatusIsSet(true);
-    this.status = status;
-    this.resourceGroup = resourceGroup;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public DeadServer(DeadServer other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetServer()) {
-      this.server = other.server;
-    }
-    this.lastStatus = other.lastStatus;
-    if (other.isSetStatus()) {
-      this.status = other.status;
-    }
-    if (other.isSetResourceGroup()) {
-      this.resourceGroup = other.resourceGroup;
-    }
-  }
-
-  @Override
-  public DeadServer deepCopy() {
-    return new DeadServer(this);
-  }
-
-  @Override
-  public void clear() {
-    this.server = null;
-    setLastStatusIsSet(false);
-    this.lastStatus = 0;
-    this.status = null;
-    this.resourceGroup = null;
-  }
-
-  @org.apache.thrift.annotation.Nullable
-  public java.lang.String getServer() {
-    return this.server;
-  }
-
-  public DeadServer setServer(@org.apache.thrift.annotation.Nullable java.lang.String server) {
-    this.server = server;
-    return this;
-  }
-
-  public void unsetServer() {
-    this.server = null;
-  }
-
-  /** Returns true if field server is set (has been assigned a value) and false otherwise */
-  public boolean isSetServer() {
-    return this.server != null;
-  }
-
-  public void setServerIsSet(boolean value) {
-    if (!value) {
-      this.server = null;
-    }
-  }
-
-  public long getLastStatus() {
-    return this.lastStatus;
-  }
-
-  public DeadServer setLastStatus(long lastStatus) {
-    this.lastStatus = lastStatus;
-    setLastStatusIsSet(true);
-    return this;
-  }
-
-  public void unsetLastStatus() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTSTATUS_ISSET_ID);
-  }
-
-  /** Returns true if field lastStatus is set (has been assigned a value) and false otherwise */
-  public boolean isSetLastStatus() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTSTATUS_ISSET_ID);
-  }
-
-  public void setLastStatusIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTSTATUS_ISSET_ID, value);
-  }
-
-  @org.apache.thrift.annotation.Nullable
-  public java.lang.String getStatus() {
-    return this.status;
-  }
-
-  public DeadServer setStatus(@org.apache.thrift.annotation.Nullable java.lang.String status) {
-    this.status = status;
-    return this;
-  }
-
-  public void unsetStatus() {
-    this.status = null;
-  }
-
-  /** Returns true if field status is set (has been assigned a value) and false otherwise */
-  public boolean isSetStatus() {
-    return this.status != null;
-  }
-
-  public void setStatusIsSet(boolean value) {
-    if (!value) {
-      this.status = null;
-    }
-  }
-
-  @org.apache.thrift.annotation.Nullable
-  public java.lang.String getResourceGroup() {
-    return this.resourceGroup;
-  }
-
-  public DeadServer setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) {
-    this.resourceGroup = resourceGroup;
-    return this;
-  }
-
-  public void unsetResourceGroup() {
-    this.resourceGroup = null;
-  }
-
-  /** Returns true if field resourceGroup is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceGroup() {
-    return this.resourceGroup != null;
-  }
-
-  public void setResourceGroupIsSet(boolean value) {
-    if (!value) {
-      this.resourceGroup = null;
-    }
-  }
-
-  @Override
-  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
-    switch (field) {
-    case SERVER:
-      if (value == null) {
-        unsetServer();
-      } else {
-        setServer((java.lang.String)value);
-      }
-      break;
-
-    case LAST_STATUS:
-      if (value == null) {
-        unsetLastStatus();
-      } else {
-        setLastStatus((java.lang.Long)value);
-      }
-      break;
-
-    case STATUS:
-      if (value == null) {
-        unsetStatus();
-      } else {
-        setStatus((java.lang.String)value);
-      }
-      break;
-
-    case RESOURCE_GROUP:
-      if (value == null) {
-        unsetResourceGroup();
-      } else {
-        setResourceGroup((java.lang.String)value);
-      }
-      break;
-
-    }
-  }
-
-  @org.apache.thrift.annotation.Nullable
-  @Override
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case SERVER:
-      return getServer();
-
-    case LAST_STATUS:
-      return getLastStatus();
-
-    case STATUS:
-      return getStatus();
-
-    case RESOURCE_GROUP:
-      return getResourceGroup();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  @Override
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case SERVER:
-      return isSetServer();
-    case LAST_STATUS:
-      return isSetLastStatus();
-    case STATUS:
-      return isSetStatus();
-    case RESOURCE_GROUP:
-      return isSetResourceGroup();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that instanceof DeadServer)
-      return this.equals((DeadServer)that);
-    return false;
-  }
-
-  public boolean equals(DeadServer that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_server = true && this.isSetServer();
-    boolean that_present_server = true && that.isSetServer();
-    if (this_present_server || that_present_server) {
-      if (!(this_present_server && that_present_server))
-        return false;
-      if (!this.server.equals(that.server))
-        return false;
-    }
-
-    boolean this_present_lastStatus = true;
-    boolean that_present_lastStatus = true;
-    if (this_present_lastStatus || that_present_lastStatus) {
-      if (!(this_present_lastStatus && that_present_lastStatus))
-        return false;
-      if (this.lastStatus != that.lastStatus)
-        return false;
-    }
-
-    boolean this_present_status = true && this.isSetStatus();
-    boolean that_present_status = true && that.isSetStatus();
-    if (this_present_status || that_present_status) {
-      if (!(this_present_status && that_present_status))
-        return false;
-      if (!this.status.equals(that.status))
-        return false;
-    }
-
-    boolean this_present_resourceGroup = true && this.isSetResourceGroup();
-    boolean that_present_resourceGroup = true && that.isSetResourceGroup();
-    if (this_present_resourceGroup || that_present_resourceGroup) {
-      if (!(this_present_resourceGroup && that_present_resourceGroup))
-        return false;
-      if (!this.resourceGroup.equals(that.resourceGroup))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetServer()) ? 131071 : 524287);
-    if (isSetServer())
-      hashCode = hashCode * 8191 + server.hashCode();
-
-    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastStatus);
-
-    hashCode = hashCode * 8191 + ((isSetStatus()) ? 131071 : 524287);
-    if (isSetStatus())
-      hashCode = hashCode * 8191 + status.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetResourceGroup()) ? 131071 : 524287);
-    if (isSetResourceGroup())
-      hashCode = hashCode * 8191 + resourceGroup.hashCode();
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(DeadServer other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.compare(isSetServer(), other.isSetServer());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetServer()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server, other.server);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.compare(isSetLastStatus(), other.isSetLastStatus());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLastStatus()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastStatus, other.lastStatus);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStatus()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.compare(isSetResourceGroup(), other.isSetResourceGroup());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceGroup()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceGroup, other.resourceGroup);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  @org.apache.thrift.annotation.Nullable
-  @Override
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  @Override
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  @Override
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("DeadServer(");
-    boolean first = true;
-
-    sb.append("server:");
-    if (this.server == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.server);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("lastStatus:");
-    sb.append(this.lastStatus);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("status:");
-    if (this.status == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.status);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceGroup:");
-    if (this.resourceGroup == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceGroup);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class DeadServerStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    @Override
-    public DeadServerStandardScheme getScheme() {
-      return new DeadServerStandardScheme();
-    }
-  }
-
-  private static class DeadServerStandardScheme extends org.apache.thrift.scheme.StandardScheme<DeadServer> {
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol iprot, DeadServer struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // SERVER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.server = iprot.readString();
-              struct.setServerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // LAST_STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lastStatus = iprot.readI64();
-              struct.setLastStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // STATUS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.status = iprot.readString();
-              struct.setStatusIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // RESOURCE_GROUP
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourceGroup = iprot.readString();
-              struct.setResourceGroupIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol oprot, DeadServer struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.server != null) {
-        oprot.writeFieldBegin(SERVER_FIELD_DESC);
-        oprot.writeString(struct.server);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(LAST_STATUS_FIELD_DESC);
-      oprot.writeI64(struct.lastStatus);
-      oprot.writeFieldEnd();
-      if (struct.status != null) {
-        oprot.writeFieldBegin(STATUS_FIELD_DESC);
-        oprot.writeString(struct.status);
-        oprot.writeFieldEnd();
-      }
-      if (struct.resourceGroup != null) {
-        oprot.writeFieldBegin(RESOURCE_GROUP_FIELD_DESC);
-        oprot.writeString(struct.resourceGroup);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class DeadServerTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    @Override
-    public DeadServerTupleScheme getScheme() {
-      return new DeadServerTupleScheme();
-    }
-  }
-
-  private static class DeadServerTupleScheme extends org.apache.thrift.scheme.TupleScheme<DeadServer> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, DeadServer struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet optionals = new java.util.BitSet();
-      if (struct.isSetServer()) {
-        optionals.set(0);
-      }
-      if (struct.isSetLastStatus()) {
-        optionals.set(1);
-      }
-      if (struct.isSetStatus()) {
-        optionals.set(2);
-      }
-      if (struct.isSetResourceGroup()) {
-        optionals.set(3);
-      }
-      oprot.writeBitSet(optionals, 4);
-      if (struct.isSetServer()) {
-        oprot.writeString(struct.server);
-      }
-      if (struct.isSetLastStatus()) {
-        oprot.writeI64(struct.lastStatus);
-      }
-      if (struct.isSetStatus()) {
-        oprot.writeString(struct.status);
-      }
-      if (struct.isSetResourceGroup()) {
-        oprot.writeString(struct.resourceGroup);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, DeadServer struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(4);
-      if (incoming.get(0)) {
-        struct.server = iprot.readString();
-        struct.setServerIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.lastStatus = iprot.readI64();
-        struct.setLastStatusIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.status = iprot.readString();
-        struct.setStatusIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.resourceGroup = iprot.readString();
-        struct.setResourceGroupIsSet(true);
-      }
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-  private static void unusedMethod() {}
-}
-
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
index 5fbeeb4276..c308cdaec9 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
@@ -3182,13 +3182,13 @@ public class FateService {
             case 5: // ARGUMENTS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list78 = iprot.readListBegin();
-                  struct.arguments = new java.util.ArrayList<java.nio.ByteBuffer>(_list78.size);
-                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem79;
-                  for (int _i80 = 0; _i80 < _list78.size; ++_i80)
+                  org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
+                  struct.arguments = new java.util.ArrayList<java.nio.ByteBuffer>(_list34.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem35;
+                  for (int _i36 = 0; _i36 < _list34.size; ++_i36)
                   {
-                    _elem79 = iprot.readBinary();
-                    struct.arguments.add(_elem79);
+                    _elem35 = iprot.readBinary();
+                    struct.arguments.add(_elem35);
                   }
                   iprot.readListEnd();
                 }
@@ -3200,15 +3200,15 @@ public class FateService {
             case 6: // OPTIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map81 = iprot.readMapBegin();
-                  struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map81.size);
-                  @org.apache.thrift.annotation.Nullable java.lang.String _key82;
-                  @org.apache.thrift.annotation.Nullable java.lang.String _val83;
-                  for (int _i84 = 0; _i84 < _map81.size; ++_i84)
+                  org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin();
+                  struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map37.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key38;
+                  @org.apache.thrift.annotation.Nullable java.lang.String _val39;
+                  for (int _i40 = 0; _i40 < _map37.size; ++_i40)
                   {
-                    _key82 = iprot.readString();
-                    _val83 = iprot.readString();
-                    struct.options.put(_key82, _val83);
+                    _key38 = iprot.readString();
+                    _val39 = iprot.readString();
+                    struct.options.put(_key38, _val39);
                   }
                   iprot.readMapEnd();
                 }
@@ -3265,9 +3265,9 @@ public class FateService {
           oprot.writeFieldBegin(ARGUMENTS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.arguments.size()));
-            for (java.nio.ByteBuffer _iter85 : struct.arguments)
+            for (java.nio.ByteBuffer _iter41 : struct.arguments)
             {
-              oprot.writeBinary(_iter85);
+              oprot.writeBinary(_iter41);
             }
             oprot.writeListEnd();
           }
@@ -3277,10 +3277,10 @@ public class FateService {
           oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.options.size()));
-            for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter86 : struct.options.entrySet())
+            for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter42 : struct.options.entrySet())
             {
-              oprot.writeString(_iter86.getKey());
-              oprot.writeString(_iter86.getValue());
+              oprot.writeString(_iter42.getKey());
+              oprot.writeString(_iter42.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -3345,19 +3345,19 @@ public class FateService {
         if (struct.isSetArguments()) {
           {
             oprot.writeI32(struct.arguments.size());
-            for (java.nio.ByteBuffer _iter87 : struct.arguments)
+            for (java.nio.ByteBuffer _iter43 : struct.arguments)
             {
-              oprot.writeBinary(_iter87);
+              oprot.writeBinary(_iter43);
             }
           }
         }
         if (struct.isSetOptions()) {
           {
             oprot.writeI32(struct.options.size());
-            for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter88 : struct.options.entrySet())
+            for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter44 : struct.options.entrySet())
             {
-              oprot.writeString(_iter88.getKey());
-              oprot.writeString(_iter88.getValue());
+              oprot.writeString(_iter44.getKey());
+              oprot.writeString(_iter44.getValue());
             }
           }
         }
@@ -3391,28 +3391,28 @@ public class FateService {
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list89 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
-            struct.arguments = new java.util.ArrayList<java.nio.ByteBuffer>(_list89.size);
-            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem90;
-            for (int _i91 = 0; _i91 < _list89.size; ++_i91)
+            org.apache.thrift.protocol.TList _list45 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.arguments = new java.util.ArrayList<java.nio.ByteBuffer>(_list45.size);
+            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem46;
+            for (int _i47 = 0; _i47 < _list45.size; ++_i47)
             {
-              _elem90 = iprot.readBinary();
-              struct.arguments.add(_elem90);
+              _elem46 = iprot.readBinary();
+              struct.arguments.add(_elem46);
             }
           }
           struct.setArgumentsIsSet(true);
         }
         if (incoming.get(5)) {
           {
-            org.apache.thrift.protocol.TMap _map92 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
-            struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map92.size);
-            @org.apache.thrift.annotation.Nullable java.lang.String _key93;
-            @org.apache.thrift.annotation.Nullable java.lang.String _val94;
-            for (int _i95 = 0; _i95 < _map92.size; ++_i95)
+            org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+            struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map48.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key49;
+            @org.apache.thrift.annotation.Nullable java.lang.String _val50;
+            for (int _i51 = 0; _i51 < _map48.size; ++_i51)
             {
-              _key93 = iprot.readString();
-              _val94 = iprot.readString();
-              struct.options.put(_key93, _val94);
+              _key49 = iprot.readString();
+              _val50 = iprot.readString();
+              struct.options.put(_key49, _val50);
             }
           }
           struct.setOptionsIsSet(true);
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java
index 7cfbb74d30..b2b859df0c 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java
@@ -2224,14 +2224,14 @@ public class FateWorkerService {
             case 4: // DESIRED
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list138 = iprot.readListBegin();
-                  struct.desired = new java.util.ArrayList<TFatePartition>(_list138.size);
-                  @org.apache.thrift.annotation.Nullable TFatePartition _elem139;
-                  for (int _i140 = 0; _i140 < _list138.size; ++_i140)
+                  org.apache.thrift.protocol.TList _list94 = iprot.readListBegin();
+                  struct.desired = new java.util.ArrayList<TFatePartition>(_list94.size);
+                  @org.apache.thrift.annotation.Nullable TFatePartition _elem95;
+                  for (int _i96 = 0; _i96 < _list94.size; ++_i96)
                   {
-                    _elem139 = new TFatePartition();
-                    _elem139.read(iprot);
-                    struct.desired.add(_elem139);
+                    _elem95 = new TFatePartition();
+                    _elem95.read(iprot);
+                    struct.desired.add(_elem95);
                   }
                   iprot.readListEnd();
                 }
@@ -2273,9 +2273,9 @@ public class FateWorkerService {
           oprot.writeFieldBegin(DESIRED_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.desired.size()));
-            for (TFatePartition _iter141 : struct.desired)
+            for (TFatePartition _iter97 : struct.desired)
             {
-              _iter141.write(oprot);
+              _iter97.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -2325,9 +2325,9 @@ public class FateWorkerService {
         if (struct.isSetDesired()) {
           {
             oprot.writeI32(struct.desired.size());
-            for (TFatePartition _iter142 : struct.desired)
+            for (TFatePartition _iter98 : struct.desired)
             {
-              _iter142.write(oprot);
+              _iter98.write(oprot);
             }
           }
         }
@@ -2353,14 +2353,14 @@ public class FateWorkerService {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list143 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.desired = new java.util.ArrayList<TFatePartition>(_list143.size);
-            @org.apache.thrift.annotation.Nullable TFatePartition _elem144;
-            for (int _i145 = 0; _i145 < _list143.size; ++_i145)
+            org.apache.thrift.protocol.TList _list99 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.desired = new java.util.ArrayList<TFatePartition>(_list99.size);
+            @org.apache.thrift.annotation.Nullable TFatePartition _elem100;
+            for (int _i101 = 0; _i101 < _list99.size; ++_i101)
             {
-              _elem144 = new TFatePartition();
-              _elem144.read(iprot);
-              struct.desired.add(_elem144);
+              _elem100 = new TFatePartition();
+              _elem100.read(iprot);
+              struct.desired.add(_elem100);
             }
           }
           struct.setDesiredIsSet(true);
@@ -3373,14 +3373,14 @@ public class FateWorkerService {
             case 3: // TPARTITIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list146 = iprot.readListBegin();
-                  struct.tpartitions = new java.util.ArrayList<TFatePartition>(_list146.size);
-                  @org.apache.thrift.annotation.Nullable TFatePartition _elem147;
-                  for (int _i148 = 0; _i148 < _list146.size; ++_i148)
+                  org.apache.thrift.protocol.TList _list102 = iprot.readListBegin();
+                  struct.tpartitions = new java.util.ArrayList<TFatePartition>(_list102.size);
+                  @org.apache.thrift.annotation.Nullable TFatePartition _elem103;
+                  for (int _i104 = 0; _i104 < _list102.size; ++_i104)
                   {
-                    _elem147 = new TFatePartition();
-                    _elem147.read(iprot);
-                    struct.tpartitions.add(_elem147);
+                    _elem103 = new TFatePartition();
+                    _elem103.read(iprot);
+                    struct.tpartitions.add(_elem103);
                   }
                   iprot.readListEnd();
                 }
@@ -3419,9 +3419,9 @@ public class FateWorkerService {
           oprot.writeFieldBegin(TPARTITIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.tpartitions.size()));
-            for (TFatePartition _iter149 : struct.tpartitions)
+            for (TFatePartition _iter105 : struct.tpartitions)
             {
-              _iter149.write(oprot);
+              _iter105.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3465,9 +3465,9 @@ public class FateWorkerService {
         if (struct.isSetTpartitions()) {
           {
             oprot.writeI32(struct.tpartitions.size());
-            for (TFatePartition _iter150 : struct.tpartitions)
+            for (TFatePartition _iter106 : struct.tpartitions)
             {
-              _iter150.write(oprot);
+              _iter106.write(oprot);
             }
           }
         }
@@ -3489,14 +3489,14 @@ public class FateWorkerService {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list151 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
-            struct.tpartitions = new java.util.ArrayList<TFatePartition>(_list151.size);
-            @org.apache.thrift.annotation.Nullable TFatePartition _elem152;
-            for (int _i153 = 0; _i153 < _list151.size; ++_i153)
+            org.apache.thrift.protocol.TList _list107 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.tpartitions = new java.util.ArrayList<TFatePartition>(_list107.size);
+            @org.apache.thrift.annotation.Nullable TFatePartition _elem108;
+            for (int _i109 = 0; _i109 < _list107.size; ++_i109)
             {
-              _elem152 = new TFatePartition();
-              _elem152.read(iprot);
-              struct.tpartitions.add(_elem152);
+              _elem108 = new TFatePartition();
+              _elem108.read(iprot);
+              struct.tpartitions.add(_elem108);
             }
           }
           struct.setTpartitionsIsSet(true);
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
index 0455f9be21..59fdd092e9 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
@@ -69,8 +69,6 @@ public class ManagerClientService {
 
     public void removeResourceGroupProperty(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup, java.lang.String property) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException, org.apache.thrift.TException;
 
-    public ManagerMonitorInfo getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
-
     public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) throws org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
 
     public void reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String serverName, TabletLoadState status, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet) throws org.apache.thrift.TException;
@@ -131,8 +129,6 @@ public class ManagerClientService {
 
     public void removeResourceGroupProperty(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup, java.lang.String property, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler) throws org.apache.thrift.TException;
-
     public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
     public void reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String serverName, TabletLoadState status, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
@@ -847,37 +843,6 @@ public class ManagerClientService {
       return;
     }
 
-    @Override
-    public ManagerMonitorInfo getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
-    {
-      send_getManagerStats(tinfo, credentials);
-      return recv_getManagerStats();
-    }
-
-    public void send_getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.thrift.TException
-    {
-      getManagerStats_args args = new getManagerStats_args();
-      args.setTinfo(tinfo);
-      args.setCredentials(credentials);
-      sendBase("getManagerStats", args);
-    }
-
-    public ManagerMonitorInfo recv_getManagerStats() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
-    {
-      getManagerStats_result result = new getManagerStats_result();
-      receiveBase(result, "getManagerStats");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.sec != null) {
-        throw result.sec;
-      }
-      if (result.tnase != null) {
-        throw result.tnase;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getManagerStats failed: unknown result");
-    }
-
     @Override
     public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) throws org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
     {
@@ -2026,44 +1991,6 @@ public class ManagerClientService {
       }
     }
 
-    @Override
-    public void getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      getManagerStats_call method_call = new getManagerStats_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class getManagerStats_call extends org.apache.thrift.async.TAsyncMethodCall<ManagerMonitorInfo> {
-      private org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo;
-      private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials;
-      public getManagerStats_call(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.tinfo = tinfo;
-        this.credentials = credentials;
-      }
-
-      @Override
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getManagerStats", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getManagerStats_args args = new getManagerStats_args();
-        args.setTinfo(tinfo);
-        args.setCredentials(credentials);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      @Override
-      public ManagerMonitorInfo getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new java.lang.IllegalStateException("Method call not finished!");
-        }
-        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
-        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getManagerStats();
-      }
-    }
-
     @Override
     public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
@@ -2428,7 +2355,6 @@ public class ManagerClientService {
       processMap.put("setResourceGroupProperty", new setResourceGroupProperty());
       processMap.put("modifyResourceGroupProperties", new modifyResourceGroupProperties());
       processMap.put("removeResourceGroupProperty", new removeResourceGroupProperty());
-      processMap.put("getManagerStats", new getManagerStats());
       processMap.put("waitForBalance", new waitForBalance());
       processMap.put("reportTabletStatus", new reportTabletStatus());
       processMap.put("getActiveTservers", new getActiveTservers());
@@ -3169,40 +3095,6 @@ public class ManagerClientService {
       }
     }
 
-    public static class getManagerStats<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getManagerStats_args> {
-      public getManagerStats() {
-        super("getManagerStats");
-      }
-
-      @Override
-      public getManagerStats_args getEmptyArgsInstance() {
-        return new getManagerStats_args();
-      }
-
-      @Override
-      protected boolean isOneway() {
-        return false;
-      }
-
-      @Override
-      protected boolean rethrowUnhandledExceptions() {
-        return false;
-      }
-
-      @Override
-      public getManagerStats_result getResult(I iface, getManagerStats_args args) throws org.apache.thrift.TException {
-        getManagerStats_result result = new getManagerStats_result();
-        try {
-          result.success = iface.getManagerStats(args.tinfo, args.credentials);
-        } catch (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
-          result.sec = sec;
-        } catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
-          result.tnase = tnase;
-        }
-        return result;
-      }
-    }
-
     public static class waitForBalance<I extends Iface> extends org.apache.thrift.ProcessFunction<I, waitForBalance_args> {
       public waitForBalance() {
         super("waitForBalance");
@@ -3504,7 +3396,6 @@ public class ManagerClientService {
       processMap.put("setResourceGroupProperty", new setResourceGroupProperty());
       processMap.put("modifyResourceGroupProperties", new modifyResourceGroupProperties());
       processMap.put("removeResourceGroupProperty", new removeResourceGroupProperty());
-      processMap.put("getManagerStats", new getManagerStats());
       processMap.put("waitForBalance", new waitForBalance());
       processMap.put("reportTabletStatus", new reportTabletStatus());
       processMap.put("getActiveTservers", new getActiveTservers());
@@ -5094,24 +4985,23 @@ public class ManagerClientService {
       }
     }
 
-    public static class getManagerStats<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getManagerStats_args, ManagerMonitorInfo> {
-      public getManagerStats() {
-        super("getManagerStats");
+    public static class waitForBalance<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, waitForBalance_args, Void> {
+      public waitForBalance() {
+        super("waitForBalance");
       }
 
       @Override
-      public getManagerStats_args getEmptyArgsInstance() {
-        return new getManagerStats_args();
+      public waitForBalance_args getEmptyArgsInstance() {
+        return new waitForBalance_args();
       }
 
       @Override
-      public org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           @Override
-          public void onComplete(ManagerMonitorInfo o) {
-            getManagerStats_result result = new getManagerStats_result();
-            result.success = o;
+          public void onComplete(Void o) {
+            waitForBalance_result result = new waitForBalance_result();
             try {
               fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
             } catch (org.apache.thrift.transport.TTransportException e) {
@@ -5126,12 +5016,8 @@ public class ManagerClientService {
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
-            getManagerStats_result result = new getManagerStats_result();
-            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
-              result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
-              result.setSecIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
+            waitForBalance_result result = new waitForBalance_result();
+            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
               result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
               result.setTnaseIsSet(true);
               msg = result;
@@ -5164,19 +5050,19 @@ public class ManagerClientService {
       }
 
       @Override
-      public void start(I iface, getManagerStats_args args, org.apache.thrift.async.AsyncMethodCallback<ManagerMonitorInfo> resultHandler) throws org.apache.thrift.TException {
-        iface.getManagerStats(args.tinfo, args.credentials,resultHandler);
+      public void start(I iface, waitForBalance_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+        iface.waitForBalance(args.tinfo,resultHandler);
       }
     }
 
-    public static class waitForBalance<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, waitForBalance_args, Void> {
-      public waitForBalance() {
-        super("waitForBalance");
+    public static class reportTabletStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, reportTabletStatus_args, Void> {
+      public reportTabletStatus() {
+        super("reportTabletStatus");
       }
 
       @Override
-      public waitForBalance_args getEmptyArgsInstance() {
-        return new waitForBalance_args();
+      public reportTabletStatus_args getEmptyArgsInstance() {
+        return new reportTabletStatus_args();
       }
 
       @Override
@@ -5185,7 +5071,48 @@ public class ManagerClientService {
         return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           @Override
           public void onComplete(Void o) {
-            waitForBalance_result result = new waitForBalance_result();
+          }
+          @Override
+          public void onError(java.lang.Exception e) {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+            } else {
+              _LOGGER.error("Exception inside oneway handler", e);
+            }
+          }
+        };
+      }
+
+      @Override
+      protected boolean isOneway() {
+        return true;
+      }
+
+      @Override
+      public void start(I iface, reportTabletStatus_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+        iface.reportTabletStatus(args.tinfo, args.credentials, args.serverName, args.status, args.tablet,resultHandler);
+      }
+    }
+
+    public static class getActiveTservers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getActiveTservers_args, java.util.List<java.lang.String>> {
+      public getActiveTservers() {
+        super("getActiveTservers");
+      }
+
+      @Override
+      public getActiveTservers_args getEmptyArgsInstance() {
+        return new getActiveTservers_args();
+      }
+
+      @Override
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>>() { 
+          @Override
+          public void onComplete(java.util.List<java.lang.String> o) {
+            getActiveTservers_result result = new getActiveTservers_result();
+            result.success = o;
             try {
               fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
             } catch (org.apache.thrift.transport.TTransportException e) {
@@ -5200,8 +5127,12 @@ public class ManagerClientService {
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
-            waitForBalance_result result = new waitForBalance_result();
-            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
+            getActiveTservers_result result = new getActiveTservers_result();
+            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
+              result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
+              result.setSecIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
               result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
               result.setTnaseIsSet(true);
               msg = result;
@@ -5234,35 +5165,70 @@ public class ManagerClientService {
       }
 
       @Override
-      public void start(I iface, waitForBalance_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
-        iface.waitForBalance(args.tinfo,resultHandler);
+      public void start(I iface, getActiveTservers_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
+        iface.getActiveTservers(args.tinfo, args.credentials,resultHandler);
       }
     }
 
-    public static class reportTabletStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, reportTabletStatus_args, Void> {
-      public reportTabletStatus() {
-        super("reportTabletStatus");
+    public static class getDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDelegationToken_args, org.apache.accumulo.core.securityImpl.thrift.TDelegationToken> {
+      public getDelegationToken() {
+        super("getDelegationToken");
       }
 
       @Override
-      public reportTabletStatus_args getEmptyArgsInstance() {
-        return new reportTabletStatus_args();
+      public getDelegationToken_args getEmptyArgsInstance() {
+        return new getDelegationToken_args();
       }
 
       @Override
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.securityImpl.thrift.TDelegationToken> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.securityImpl.thrift.TDelegationToken>() { 
           @Override
-          public void onComplete(Void o) {
+          public void onComplete(org.apache.accumulo.core.securityImpl.thrift.TDelegationToken o) {
+            getDelegationToken_result result = new getDelegationToken_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
+            }
           }
           @Override
           public void onError(java.lang.Exception e) {
-            if (e instanceof org.apache.thrift.transport.TTransportException) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TSerializable msg;
+            getDelegationToken_result result = new getDelegationToken_result();
+            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
+              result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
+              result.setSecIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
+              result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
+              result.setTnaseIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
               _LOGGER.error("TTransportException inside handler", e);
               fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
             } else {
-              _LOGGER.error("Exception inside oneway handler", e);
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
           }
         };
@@ -5270,33 +5236,32 @@ public class ManagerClientService {
 
       @Override
       protected boolean isOneway() {
-        return true;
+        return false;
       }
 
       @Override
-      public void start(I iface, reportTabletStatus_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
-        iface.reportTabletStatus(args.tinfo, args.credentials, args.serverName, args.status, args.tablet,resultHandler);
+      public void start(I iface, getDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.securityImpl.thrift.TDelegationToken> resultHandler) throws org.apache.thrift.TException {
+        iface.getDelegationToken(args.tinfo, args.credentials, args.cfg,resultHandler);
       }
     }
 
-    public static class getActiveTservers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getActiveTservers_args, java.util.List<java.lang.String>> {
-      public getActiveTservers() {
-        super("getActiveTservers");
+    public static class requestTabletHosting<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, requestTabletHosting_args, Void> {
+      public requestTabletHosting() {
+        super("requestTabletHosting");
       }
 
       @Override
-      public getActiveTservers_args getEmptyArgsInstance() {
-        return new getActiveTservers_args();
+      public requestTabletHosting_args getEmptyArgsInstance() {
+        return new requestTabletHosting_args();
       }
 
       @Override
-      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           @Override
-          public void onComplete(java.util.List<java.lang.String> o) {
-            getActiveTservers_result result = new getActiveTservers_result();
-            result.success = o;
+          public void onComplete(Void o) {
+            requestTabletHosting_result result = new requestTabletHosting_result();
             try {
               fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
             } catch (org.apache.thrift.transport.TTransportException e) {
@@ -5311,11 +5276,15 @@ public class ManagerClientService {
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
-            getActiveTservers_result result = new getActiveTservers_result();
+            requestTabletHosting_result result = new requestTabletHosting_result();
             if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
               result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
               result.setSecIsSet(true);
               msg = result;
+            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) {
+              result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e;
+              result.setToeIsSet(true);
+              msg = result;
             } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
               result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
               result.setTnaseIsSet(true);
@@ -5349,28 +5318,28 @@ public class ManagerClientService {
       }
 
       @Override
-      public void start(I iface, getActiveTservers_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
-        iface.getActiveTservers(args.tinfo, args.credentials,resultHandler);
+      public void start(I iface, requestTabletHosting_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+        iface.requestTabletHosting(args.tinfo, args.credentials, args.tableId, args.extents,resultHandler);
       }
     }
 
-    public static class getDelegationToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDelegationToken_args, org.apache.accumulo.core.securityImpl.thrift.TDelegationToken> {
-      public getDelegationToken() {
-        super("getDelegationToken");
+    public static class updateTabletMergeability<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateTabletMergeability_args, java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>> {
+      public updateTabletMergeability() {
+        super("updateTabletMergeability");
       }
 
       @Override
-      public getDelegationToken_args getEmptyArgsInstance() {
-        return new getDelegationToken_args();
+      public updateTabletMergeability_args getEmptyArgsInstance() {
+        return new updateTabletMergeability_args();
       }
 
       @Override
-      public org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.securityImpl.thrift.TDelegationToken> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.securityImpl.thrift.TDelegationToken>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>>() { 
           @Override
-          public void onComplete(org.apache.accumulo.core.securityImpl.thrift.TDelegationToken o) {
-            getDelegationToken_result result = new getDelegationToken_result();
+          public void onComplete(java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent> o) {
+            updateTabletMergeability_result result = new updateTabletMergeability_result();
             result.success = o;
             try {
               fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -5386,167 +5355,14 @@ public class ManagerClientService {
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
-            getDelegationToken_result result = new getDelegationToken_result();
+            updateTabletMergeability_result result = new updateTabletMergeability_result();
             if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
               result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
               result.setSecIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
-              result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
-              result.setTnaseIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
-              _LOGGER.error("TTransportException inside handler", e);
-              fb.close();
-              return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
-              _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
-            } else {
-              _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
-            }
-            try {
-              fcall.sendResponse(fb,msg,msgType,seqid);
-            } catch (java.lang.Exception ex) {
-              _LOGGER.error("Exception writing to internal frame buffer", ex);
-              fb.close();
-            }
-          }
-        };
-      }
-
-      @Override
-      protected boolean isOneway() {
-        return false;
-      }
-
-      @Override
-      public void start(I iface, getDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.accumulo.core.securityImpl.thrift.TDelegationToken> resultHandler) throws org.apache.thrift.TException {
-        iface.getDelegationToken(args.tinfo, args.credentials, args.cfg,resultHandler);
-      }
-    }
-
-    public static class requestTabletHosting<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, requestTabletHosting_args, Void> {
-      public requestTabletHosting() {
-        super("requestTabletHosting");
-      }
-
-      @Override
-      public requestTabletHosting_args getEmptyArgsInstance() {
-        return new requestTabletHosting_args();
-      }
-
-      @Override
-      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
-          @Override
-          public void onComplete(Void o) {
-            requestTabletHosting_result result = new requestTabletHosting_result();
-            try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
-              _LOGGER.error("TTransportException writing to internal frame buffer", e);
-              fb.close();
-            } catch (java.lang.Exception e) {
-              _LOGGER.error("Exception writing to internal frame buffer", e);
-              onError(e);
-            }
-          }
-          @Override
-          public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
-            requestTabletHosting_result result = new requestTabletHosting_result();
-            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
-              result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
-              result.setSecIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) {
-              result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e;
-              result.setToeIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
-              result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
-              result.setTnaseIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
-              _LOGGER.error("TTransportException inside handler", e);
-              fb.close();
-              return;
-            } else if (e instanceof org.apache.thrift.TApplicationException) {
-              _LOGGER.error("TApplicationException inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TApplicationException)e;
-            } else {
-              _LOGGER.error("Exception inside handler", e);
-              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
-            }
-            try {
-              fcall.sendResponse(fb,msg,msgType,seqid);
-            } catch (java.lang.Exception ex) {
-              _LOGGER.error("Exception writing to internal frame buffer", ex);
-              fb.close();
-            }
-          }
-        };
-      }
-
-      @Override
-      protected boolean isOneway() {
-        return false;
-      }
-
-      @Override
-      public void start(I iface, requestTabletHosting_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
-        iface.requestTabletHosting(args.tinfo, args.credentials, args.tableId, args.extents,resultHandler);
-      }
-    }
-
-    public static class updateTabletMergeability<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateTabletMergeability_args, java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>> {
-      public updateTabletMergeability() {
-        super("updateTabletMergeability");
-      }
-
-      @Override
-      public updateTabletMergeability_args getEmptyArgsInstance() {
-        return new updateTabletMergeability_args();
-      }
-
-      @Override
-      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>>() { 
-          @Override
-          public void onComplete(java.util.List<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent> o) {
-            updateTabletMergeability_result result = new updateTabletMergeability_result();
-            result.success = o;
-            try {
-              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-            } catch (org.apache.thrift.transport.TTransportException e) {
-              _LOGGER.error("TTransportException writing to internal frame buffer", e);
-              fb.close();
-            } catch (java.lang.Exception e) {
-              _LOGGER.error("Exception writing to internal frame buffer", e);
-              onError(e);
-            }
-          }
-          @Override
-          public void onError(java.lang.Exception e) {
-            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TSerializable msg;
-            updateTabletMergeability_result result = new updateTabletMergeability_result();
-            if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) {
-              result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e;
-              result.setSecIsSet(true);
-              msg = result;
-            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) {
-              result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e;
-              result.setToeIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) {
+              result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e;
+              result.setToeIsSet(true);
               msg = result;
             } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) {
               result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
@@ -6569,1695 +6385,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public initiateFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
-      this.tnase = tnase;
-      return this;
-    }
-
-    public void unsetTnase() {
-      this.tnase = null;
-    }
-
-    /** Returns true if field tnase is set (has been assigned a value) and false otherwise */
-    public boolean isSetTnase() {
-      return this.tnase != null;
-    }
-
-    public void setTnaseIsSet(boolean value) {
-      if (!value) {
-        this.tnase = null;
-      }
-    }
-
-    @Override
-    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
-      switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((java.lang.Long)value);
-        }
-        break;
-
-      case SEC:
-        if (value == null) {
-          unsetSec();
-        } else {
-          setSec((org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException)value);
-        }
-        break;
-
-      case TOPE:
-        if (value == null) {
-          unsetTope();
-        } else {
-          setTope((org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException)value);
-        }
-        break;
-
-      case TNASE:
-        if (value == null) {
-          unsetTnase();
-        } else {
-          setTnase((org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException)value);
-        }
-        break;
-
-      }
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    @Override
-    public java.lang.Object getFieldValue(_Fields field) {
-      switch (field) {
-      case SUCCESS:
-        return getSuccess();
-
-      case SEC:
-        return getSec();
-
-      case TOPE:
-        return getTope();
-
-      case TNASE:
-        return getTnase();
-
-      }
-      throw new java.lang.IllegalStateException();
-    }
-
-    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-    @Override
-    public boolean isSet(_Fields field) {
-      if (field == null) {
-        throw new java.lang.IllegalArgumentException();
-      }
-
-      switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
-      case SEC:
-        return isSetSec();
-      case TOPE:
-        return isSetTope();
-      case TNASE:
-        return isSetTnase();
-      }
-      throw new java.lang.IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(java.lang.Object that) {
-      if (that instanceof initiateFlush_result)
-        return this.equals((initiateFlush_result)that);
-      return false;
-    }
-
-    public boolean equals(initiateFlush_result that) {
-      if (that == null)
-        return false;
-      if (this == that)
-        return true;
-
-      boolean this_present_success = true;
-      boolean that_present_success = true;
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (this.success != that.success)
-          return false;
-      }
-
-      boolean this_present_sec = true && this.isSetSec();
-      boolean that_present_sec = true && that.isSetSec();
-      if (this_present_sec || that_present_sec) {
-        if (!(this_present_sec && that_present_sec))
-          return false;
-        if (!this.sec.equals(that.sec))
-          return false;
-      }
-
-      boolean this_present_tope = true && this.isSetTope();
-      boolean that_present_tope = true && that.isSetTope();
-      if (this_present_tope || that_present_tope) {
-        if (!(this_present_tope && that_present_tope))
-          return false;
-        if (!this.tope.equals(that.tope))
-          return false;
-      }
-
-      boolean this_present_tnase = true && this.isSetTnase();
-      boolean that_present_tnase = true && that.isSetTnase();
-      if (this_present_tnase || that_present_tnase) {
-        if (!(this_present_tnase && that_present_tnase))
-          return false;
-        if (!this.tnase.equals(that.tnase))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      int hashCode = 1;
-
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success);
-
-      hashCode = hashCode * 8191 + ((isSetSec()) ? 131071 : 524287);
-      if (isSetSec())
-        hashCode = hashCode * 8191 + sec.hashCode();
-
-      hashCode = hashCode * 8191 + ((isSetTope()) ? 131071 : 524287);
-      if (isSetTope())
-        hashCode = hashCode * 8191 + tope.hashCode();
-
-      hashCode = hashCode * 8191 + ((isSetTnase()) ? 131071 : 524287);
-      if (isSetTnase())
-        hashCode = hashCode * 8191 + tnase.hashCode();
-
-      return hashCode;
-    }
-
-    @Override
-    public int compareTo(initiateFlush_result other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-
-      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSec()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, other.sec);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTope()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tope, other.tope);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTnase()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tnase, other.tnase);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      return 0;
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    @Override
-    public _Fields fieldForId(int fieldId) {
-      return _Fields.findByThriftId(fieldId);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      scheme(iprot).read(iprot, this);
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      scheme(oprot).write(oprot, this);
-      }
-
-    @Override
-    public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("initiateFlush_result(");
-      boolean first = true;
-
-      sb.append("success:");
-      sb.append(this.success);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("sec:");
-      if (this.sec == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.sec);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("tope:");
-      if (this.tope == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tope);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("tnase:");
-      if (this.tnase == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tnase);
-      }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws org.apache.thrift.TException {
-      // check for required fields
-      // check for sub-struct validity
-    }
-
-    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-      try {
-        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
-        throw new java.io.IOException(te);
-      }
-    }
-
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-      try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bitfield = 0;
-        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
-        throw new java.io.IOException(te);
-      }
-    }
-
-    private static class initiateFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      @Override
-      public initiateFlush_resultStandardScheme getScheme() {
-        return new initiateFlush_resultStandardScheme();
-      }
-    }
-
-    private static class initiateFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<initiateFlush_result> {
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, initiateFlush_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.success = iprot.readI64();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // SEC
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
-                struct.sec.read(iprot);
-                struct.setSecIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TOPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException();
-                struct.tope.read(iprot);
-                struct.setTopeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // TNASE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException();
-                struct.tnase.read(iprot);
-                struct.setTnaseIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-          }
-          iprot.readFieldEnd();
-        }
-        iprot.readStructEnd();
-
-        // check for required fields of primitive type, which can't be checked in the validate method
-        struct.validate();
-      }
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, initiateFlush_result struct) throws org.apache.thrift.TException {
-        struct.validate();
-
-        oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.isSetSuccess()) {
-          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-          oprot.writeI64(struct.success);
-          oprot.writeFieldEnd();
-        }
-        if (struct.sec != null) {
-          oprot.writeFieldBegin(SEC_FIELD_DESC);
-          struct.sec.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.tope != null) {
-          oprot.writeFieldBegin(TOPE_FIELD_DESC);
-          struct.tope.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.tnase != null) {
-          oprot.writeFieldBegin(TNASE_FIELD_DESC);
-          struct.tnase.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-
-    }
-
-    private static class initiateFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      @Override
-      public initiateFlush_resultTupleScheme getScheme() {
-        return new initiateFlush_resultTupleScheme();
-      }
-    }
-
-    private static class initiateFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<initiateFlush_result> {
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet optionals = new java.util.BitSet();
-        if (struct.isSetSuccess()) {
-          optionals.set(0);
-        }
-        if (struct.isSetSec()) {
-          optionals.set(1);
-        }
-        if (struct.isSetTope()) {
-          optionals.set(2);
-        }
-        if (struct.isSetTnase()) {
-          optionals.set(3);
-        }
-        oprot.writeBitSet(optionals, 4);
-        if (struct.isSetSuccess()) {
-          oprot.writeI64(struct.success);
-        }
-        if (struct.isSetSec()) {
-          struct.sec.write(oprot);
-        }
-        if (struct.isSetTope()) {
-          struct.tope.write(oprot);
-        }
-        if (struct.isSetTnase()) {
-          struct.tnase.write(oprot);
-        }
-      }
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
-        if (incoming.get(0)) {
-          struct.success = iprot.readI64();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
-          struct.sec.read(iprot);
-          struct.setSecIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException();
-          struct.tope.read(iprot);
-          struct.setTopeIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException();
-          struct.tnase.read(iprot);
-          struct.setTnaseIsSet(true);
-        }
-      }
-    }
-
-    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-    }
-  }
-
-  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class waitForFlush_args implements org.apache.thrift.TBase<waitForFlush_args, waitForFlush_args._Fields>, java.io.Serializable, Cloneable, Comparable<waitForFlush_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_args");
-
-    private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)4);
-    private static final org.apache.thrift.protocol.TField END_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("endRow", org.apache.thrift.protocol.TType.STRING, (short)5);
-    private static final org.apache.thrift.protocol.TField FLUSH_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("flushID", org.apache.thrift.protocol.TType.I64, (short)6);
-    private static final org.apache.thrift.protocol.TField MAX_LOOPS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxLoops", org.apache.thrift.protocol.TType.I64, (short)7);
-
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_argsTupleSchemeFactory();
-
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required
-    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow; // required
-    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow; // required
-    public long flushID; // required
-    public long maxLoops; // required
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      TINFO((short)1, "tinfo"),
-      CREDENTIALS((short)2, "credentials"),
-      TABLE_NAME((short)3, "tableName"),
-      START_ROW((short)4, "startRow"),
-      END_ROW((short)5, "endRow"),
-      FLUSH_ID((short)6, "flushID"),
-      MAX_LOOPS((short)7, "maxLoops");
-
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-      static {
-        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      @org.apache.thrift.annotation.Nullable
-      public static _Fields findByThriftId(int fieldId) {
-        switch(fieldId) {
-          case 1: // TINFO
-            return TINFO;
-          case 2: // CREDENTIALS
-            return CREDENTIALS;
-          case 3: // TABLE_NAME
-            return TABLE_NAME;
-          case 4: // START_ROW
-            return START_ROW;
-          case 5: // END_ROW
-            return END_ROW;
-          case 6: // FLUSH_ID
-            return FLUSH_ID;
-          case 7: // MAX_LOOPS
-            return MAX_LOOPS;
-          default:
-            return null;
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, throwing an exception
-       * if it is not found.
-       */
-      public static _Fields findByThriftIdOrThrow(int fieldId) {
-        _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-        return fields;
-      }
-
-      /**
-       * Find the _Fields constant that matches name, or null if its not found.
-       */
-      @org.apache.thrift.annotation.Nullable
-      public static _Fields findByName(java.lang.String name) {
-        return byName.get(name);
-      }
-
-      private final short _thriftId;
-      private final java.lang.String _fieldName;
-
-      _Fields(short thriftId, java.lang.String fieldName) {
-        _thriftId = thriftId;
-        _fieldName = fieldName;
-      }
-
-      @Override
-      public short getThriftFieldId() {
-        return _thriftId;
-      }
-
-      @Override
-      public java.lang.String getFieldName() {
-        return _fieldName;
-      }
-    }
-
-    // isset id assignments
-    private static final int __FLUSHID_ISSET_ID = 0;
-    private static final int __MAXLOOPS_ISSET_ID = 1;
-    private byte __isset_bitfield = 0;
-    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-    static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class)));
-      tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
-      tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      tmpMap.put(_Fields.END_ROW, new org.apache.thrift.meta_data.FieldMetaData("endRow", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      tmpMap.put(_Fields.FLUSH_ID, new org.apache.thrift.meta_data.FieldMetaData("flushID", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-      tmpMap.put(_Fields.MAX_LOOPS, new org.apache.thrift.meta_data.FieldMetaData("maxLoops", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_args.class, metaDataMap);
-    }
-
-    public waitForFlush_args() {
-    }
-
-    public waitForFlush_args(
-      org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
-      org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
-      java.lang.String tableName,
-      java.nio.ByteBuffer startRow,
-      java.nio.ByteBuffer endRow,
-      long flushID,
-      long maxLoops)
-    {
-      this();
-      this.tinfo = tinfo;
-      this.credentials = credentials;
-      this.tableName = tableName;
-      this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
-      this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
-      this.flushID = flushID;
-      setFlushIDIsSet(true);
-      this.maxLoops = maxLoops;
-      setMaxLoopsIsSet(true);
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public waitForFlush_args(waitForFlush_args other) {
-      __isset_bitfield = other.__isset_bitfield;
-      if (other.isSetTinfo()) {
-        this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
-      }
-      if (other.isSetCredentials()) {
-        this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials);
-      }
-      if (other.isSetTableName()) {
-        this.tableName = other.tableName;
-      }
-      if (other.isSetStartRow()) {
-        this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow);
-      }
-      if (other.isSetEndRow()) {
-        this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow);
-      }
-      this.flushID = other.flushID;
-      this.maxLoops = other.maxLoops;
-    }
-
-    @Override
-    public waitForFlush_args deepCopy() {
-      return new waitForFlush_args(this);
-    }
-
-    @Override
-    public void clear() {
-      this.tinfo = null;
-      this.credentials = null;
-      this.tableName = null;
-      this.startRow = null;
-      this.endRow = null;
-      setFlushIDIsSet(false);
-      this.flushID = 0;
-      setMaxLoopsIsSet(false);
-      this.maxLoops = 0;
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() {
-      return this.tinfo;
-    }
-
-    public waitForFlush_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
-      this.tinfo = tinfo;
-      return this;
-    }
-
-    public void unsetTinfo() {
-      this.tinfo = null;
-    }
-
-    /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */
-    public boolean isSetTinfo() {
-      return this.tinfo != null;
-    }
-
-    public void setTinfoIsSet(boolean value) {
-      if (!value) {
-        this.tinfo = null;
-      }
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials() {
-      return this.credentials;
-    }
-
-    public waitForFlush_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
-      this.credentials = credentials;
-      return this;
-    }
-
-    public void unsetCredentials() {
-      this.credentials = null;
-    }
-
-    /** Returns true if field credentials is set (has been assigned a value) and false otherwise */
-    public boolean isSetCredentials() {
-      return this.credentials != null;
-    }
-
-    public void setCredentialsIsSet(boolean value) {
-      if (!value) {
-        this.credentials = null;
-      }
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    public java.lang.String getTableName() {
-      return this.tableName;
-    }
-
-    public waitForFlush_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
-      this.tableName = tableName;
-      return this;
-    }
-
-    public void unsetTableName() {
-      this.tableName = null;
-    }
-
-    /** Returns true if field tableName is set (has been assigned a value) and false otherwise */
-    public boolean isSetTableName() {
-      return this.tableName != null;
-    }
-
-    public void setTableNameIsSet(boolean value) {
-      if (!value) {
-        this.tableName = null;
-      }
-    }
-
-    public byte[] getStartRow() {
-      setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow));
-      return startRow == null ? null : startRow.array();
-    }
-
-    public java.nio.ByteBuffer bufferForStartRow() {
-      return org.apache.thrift.TBaseHelper.copyBinary(startRow);
-    }
-
-    public waitForFlush_args setStartRow(byte[] startRow) {
-      this.startRow = startRow == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(startRow.clone());
-      return this;
-    }
-
-    public waitForFlush_args setStartRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow) {
-      this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
-      return this;
-    }
-
-    public void unsetStartRow() {
-      this.startRow = null;
-    }
-
-    /** Returns true if field startRow is set (has been assigned a value) and false otherwise */
-    public boolean isSetStartRow() {
-      return this.startRow != null;
-    }
-
-    public void setStartRowIsSet(boolean value) {
-      if (!value) {
-        this.startRow = null;
-      }
-    }
-
-    public byte[] getEndRow() {
-      setEndRow(org.apache.thrift.TBaseHelper.rightSize(endRow));
-      return endRow == null ? null : endRow.array();
-    }
-
-    public java.nio.ByteBuffer bufferForEndRow() {
-      return org.apache.thrift.TBaseHelper.copyBinary(endRow);
-    }
-
-    public waitForFlush_args setEndRow(byte[] endRow) {
-      this.endRow = endRow == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(endRow.clone());
-      return this;
-    }
-
-    public waitForFlush_args setEndRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow) {
-      this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
-      return this;
-    }
-
-    public void unsetEndRow() {
-      this.endRow = null;
-    }
-
-    /** Returns true if field endRow is set (has been assigned a value) and false otherwise */
-    public boolean isSetEndRow() {
-      return this.endRow != null;
-    }
-
-    public void setEndRowIsSet(boolean value) {
-      if (!value) {
-        this.endRow = null;
-      }
-    }
-
-    public long getFlushID() {
-      return this.flushID;
-    }
-
-    public waitForFlush_args setFlushID(long flushID) {
-      this.flushID = flushID;
-      setFlushIDIsSet(true);
-      return this;
-    }
-
-    public void unsetFlushID() {
-      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FLUSHID_ISSET_ID);
-    }
-
-    /** Returns true if field flushID is set (has been assigned a value) and false otherwise */
-    public boolean isSetFlushID() {
-      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FLUSHID_ISSET_ID);
-    }
-
-    public void setFlushIDIsSet(boolean value) {
-      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FLUSHID_ISSET_ID, value);
-    }
-
-    public long getMaxLoops() {
-      return this.maxLoops;
-    }
-
-    public waitForFlush_args setMaxLoops(long maxLoops) {
-      this.maxLoops = maxLoops;
-      setMaxLoopsIsSet(true);
-      return this;
-    }
-
-    public void unsetMaxLoops() {
-      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXLOOPS_ISSET_ID);
-    }
-
-    /** Returns true if field maxLoops is set (has been assigned a value) and false otherwise */
-    public boolean isSetMaxLoops() {
-      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXLOOPS_ISSET_ID);
-    }
-
-    public void setMaxLoopsIsSet(boolean value) {
-      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXLOOPS_ISSET_ID, value);
-    }
-
-    @Override
-    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
-      switch (field) {
-      case TINFO:
-        if (value == null) {
-          unsetTinfo();
-        } else {
-          setTinfo((org.apache.accumulo.core.clientImpl.thrift.TInfo)value);
-        }
-        break;
-
-      case CREDENTIALS:
-        if (value == null) {
-          unsetCredentials();
-        } else {
-          setCredentials((org.apache.accumulo.core.securityImpl.thrift.TCredentials)value);
-        }
-        break;
-
-      case TABLE_NAME:
-        if (value == null) {
-          unsetTableName();
-        } else {
-          setTableName((java.lang.String)value);
-        }
-        break;
-
-      case START_ROW:
-        if (value == null) {
-          unsetStartRow();
-        } else {
-          if (value instanceof byte[]) {
-            setStartRow((byte[])value);
-          } else {
-            setStartRow((java.nio.ByteBuffer)value);
-          }
-        }
-        break;
-
-      case END_ROW:
-        if (value == null) {
-          unsetEndRow();
-        } else {
-          if (value instanceof byte[]) {
-            setEndRow((byte[])value);
-          } else {
-            setEndRow((java.nio.ByteBuffer)value);
-          }
-        }
-        break;
-
-      case FLUSH_ID:
-        if (value == null) {
-          unsetFlushID();
-        } else {
-          setFlushID((java.lang.Long)value);
-        }
-        break;
-
-      case MAX_LOOPS:
-        if (value == null) {
-          unsetMaxLoops();
-        } else {
-          setMaxLoops((java.lang.Long)value);
-        }
-        break;
-
-      }
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    @Override
-    public java.lang.Object getFieldValue(_Fields field) {
-      switch (field) {
-      case TINFO:
-        return getTinfo();
-
-      case CREDENTIALS:
-        return getCredentials();
-
-      case TABLE_NAME:
-        return getTableName();
-
-      case START_ROW:
-        return getStartRow();
-
-      case END_ROW:
-        return getEndRow();
-
-      case FLUSH_ID:
-        return getFlushID();
-
-      case MAX_LOOPS:
-        return getMaxLoops();
-
-      }
-      throw new java.lang.IllegalStateException();
-    }
-
-    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-    @Override
-    public boolean isSet(_Fields field) {
-      if (field == null) {
-        throw new java.lang.IllegalArgumentException();
-      }
-
-      switch (field) {
-      case TINFO:
-        return isSetTinfo();
-      case CREDENTIALS:
-        return isSetCredentials();
-      case TABLE_NAME:
-        return isSetTableName();
-      case START_ROW:
-        return isSetStartRow();
-      case END_ROW:
-        return isSetEndRow();
-      case FLUSH_ID:
-        return isSetFlushID();
-      case MAX_LOOPS:
-        return isSetMaxLoops();
-      }
-      throw new java.lang.IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(java.lang.Object that) {
-      if (that instanceof waitForFlush_args)
-        return this.equals((waitForFlush_args)that);
-      return false;
-    }
-
-    public boolean equals(waitForFlush_args that) {
-      if (that == null)
-        return false;
-      if (this == that)
-        return true;
-
-      boolean this_present_tinfo = true && this.isSetTinfo();
-      boolean that_present_tinfo = true && that.isSetTinfo();
-      if (this_present_tinfo || that_present_tinfo) {
-        if (!(this_present_tinfo && that_present_tinfo))
-          return false;
-        if (!this.tinfo.equals(that.tinfo))
-          return false;
-      }
-
-      boolean this_present_credentials = true && this.isSetCredentials();
-      boolean that_present_credentials = true && that.isSetCredentials();
-      if (this_present_credentials || that_present_credentials) {
-        if (!(this_present_credentials && that_present_credentials))
-          return false;
-        if (!this.credentials.equals(that.credentials))
-          return false;
-      }
-
-      boolean this_present_tableName = true && this.isSetTableName();
-      boolean that_present_tableName = true && that.isSetTableName();
-      if (this_present_tableName || that_present_tableName) {
-        if (!(this_present_tableName && that_present_tableName))
-          return false;
-        if (!this.tableName.equals(that.tableName))
-          return false;
-      }
-
-      boolean this_present_startRow = true && this.isSetStartRow();
-      boolean that_present_startRow = true && that.isSetStartRow();
-      if (this_present_startRow || that_present_startRow) {
-        if (!(this_present_startRow && that_present_startRow))
-          return false;
-        if (!this.startRow.equals(that.startRow))
-          return false;
-      }
-
-      boolean this_present_endRow = true && this.isSetEndRow();
-      boolean that_present_endRow = true && that.isSetEndRow();
-      if (this_present_endRow || that_present_endRow) {
-        if (!(this_present_endRow && that_present_endRow))
-          return false;
-        if (!this.endRow.equals(that.endRow))
-          return false;
-      }
-
-      boolean this_present_flushID = true;
-      boolean that_present_flushID = true;
-      if (this_present_flushID || that_present_flushID) {
-        if (!(this_present_flushID && that_present_flushID))
-          return false;
-        if (this.flushID != that.flushID)
-          return false;
-      }
-
-      boolean this_present_maxLoops = true;
-      boolean that_present_maxLoops = true;
-      if (this_present_maxLoops || that_present_maxLoops) {
-        if (!(this_present_maxLoops && that_present_maxLoops))
-          return false;
-        if (this.maxLoops != that.maxLoops)
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      int hashCode = 1;
-
-      hashCode = hashCode * 8191 + ((isSetTinfo()) ? 131071 : 524287);
-      if (isSetTinfo())
-        hashCode = hashCode * 8191 + tinfo.hashCode();
-
-      hashCode = hashCode * 8191 + ((isSetCredentials()) ? 131071 : 524287);
-      if (isSetCredentials())
-        hashCode = hashCode * 8191 + credentials.hashCode();
-
-      hashCode = hashCode * 8191 + ((isSetTableName()) ? 131071 : 524287);
-      if (isSetTableName())
-        hashCode = hashCode * 8191 + tableName.hashCode();
-
-      hashCode = hashCode * 8191 + ((isSetStartRow()) ? 131071 : 524287);
-      if (isSetStartRow())
-        hashCode = hashCode * 8191 + startRow.hashCode();
-
-      hashCode = hashCode * 8191 + ((isSetEndRow()) ? 131071 : 524287);
-      if (isSetEndRow())
-        hashCode = hashCode * 8191 + endRow.hashCode();
-
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(flushID);
-
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(maxLoops);
-
-      return hashCode;
-    }
-
-    @Override
-    public int compareTo(waitForFlush_args other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-
-      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTinfo()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, other.tinfo);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetCredentials()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTableName()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, other.tableName);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetStartRow(), other.isSetStartRow());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetStartRow()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetEndRow()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endRow, other.endRow);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetFlushID(), other.isSetFlushID());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetFlushID()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.flushID, other.flushID);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = java.lang.Boolean.compare(isSetMaxLoops(), other.isSetMaxLoops());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetMaxLoops()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxLoops, other.maxLoops);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      return 0;
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    @Override
-    public _Fields fieldForId(int fieldId) {
-      return _Fields.findByThriftId(fieldId);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      scheme(iprot).read(iprot, this);
-    }
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      scheme(oprot).write(oprot, this);
-    }
-
-    @Override
-    public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_args(");
-      boolean first = true;
-
-      sb.append("tinfo:");
-      if (this.tinfo == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tinfo);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("credentials:");
-      if (this.credentials == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.credentials);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("tableName:");
-      if (this.tableName == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tableName);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("startRow:");
-      if (this.startRow == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.startRow, sb);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("endRow:");
-      if (this.endRow == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.endRow, sb);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("flushID:");
-      sb.append(this.flushID);
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("maxLoops:");
-      sb.append(this.maxLoops);
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws org.apache.thrift.TException {
-      // check for required fields
-      // check for sub-struct validity
-      if (tinfo != null) {
-        tinfo.validate();
-      }
-      if (credentials != null) {
-        credentials.validate();
-      }
-    }
-
-    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-      try {
-        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-      } catch (org.apache.thrift.TException te) {
-        throw new java.io.IOException(te);
-      }
-    }
-
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-      try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bitfield = 0;
-        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-      } catch (org.apache.thrift.TException te) {
-        throw new java.io.IOException(te);
-      }
-    }
-
-    private static class waitForFlush_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      @Override
-      public waitForFlush_argsStandardScheme getScheme() {
-        return new waitForFlush_argsStandardScheme();
-      }
-    }
-
-    private static class waitForFlush_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<waitForFlush_args> {
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // TINFO
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo();
-                struct.tinfo.read(iprot);
-                struct.setTinfoIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // CREDENTIALS
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials();
-                struct.credentials.read(iprot);
-                struct.setCredentialsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // TABLE_NAME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tableName = iprot.readString();
-                struct.setTableNameIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 4: // START_ROW
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.startRow = iprot.readBinary();
-                struct.setStartRowIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // END_ROW
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.endRow = iprot.readBinary();
-                struct.setEndRowIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 6: // FLUSH_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.flushID = iprot.readI64();
-                struct.setFlushIDIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 7: // MAX_LOOPS
-              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-                struct.maxLoops = iprot.readI64();
-                struct.setMaxLoopsIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            default:
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-          }
-          iprot.readFieldEnd();
-        }
-        iprot.readStructEnd();
-
-        // check for required fields of primitive type, which can't be checked in the validate method
-        struct.validate();
-      }
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_args struct) throws org.apache.thrift.TException {
-        struct.validate();
-
-        oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.tinfo != null) {
-          oprot.writeFieldBegin(TINFO_FIELD_DESC);
-          struct.tinfo.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.credentials != null) {
-          oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
-          struct.credentials.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.tableName != null) {
-          oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC);
-          oprot.writeString(struct.tableName);
-          oprot.writeFieldEnd();
-        }
-        if (struct.startRow != null) {
-          oprot.writeFieldBegin(START_ROW_FIELD_DESC);
-          oprot.writeBinary(struct.startRow);
-          oprot.writeFieldEnd();
-        }
-        if (struct.endRow != null) {
-          oprot.writeFieldBegin(END_ROW_FIELD_DESC);
-          oprot.writeBinary(struct.endRow);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldBegin(FLUSH_ID_FIELD_DESC);
-        oprot.writeI64(struct.flushID);
-        oprot.writeFieldEnd();
-        oprot.writeFieldBegin(MAX_LOOPS_FIELD_DESC);
-        oprot.writeI64(struct.maxLoops);
-        oprot.writeFieldEnd();
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-
-    }
-
-    private static class waitForFlush_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      @Override
-      public waitForFlush_argsTupleScheme getScheme() {
-        return new waitForFlush_argsTupleScheme();
-      }
-    }
-
-    private static class waitForFlush_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<waitForFlush_args> {
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet optionals = new java.util.BitSet();
-        if (struct.isSetTinfo()) {
-          optionals.set(0);
-        }
-        if (struct.isSetCredentials()) {
-          optionals.set(1);
-        }
-        if (struct.isSetTableName()) {
-          optionals.set(2);
-        }
-        if (struct.isSetStartRow()) {
-          optionals.set(3);
-        }
-        if (struct.isSetEndRow()) {
-          optionals.set(4);
-        }
-        if (struct.isSetFlushID()) {
-          optionals.set(5);
-        }
-        if (struct.isSetMaxLoops()) {
-          optionals.set(6);
-        }
-        oprot.writeBitSet(optionals, 7);
-        if (struct.isSetTinfo()) {
-          struct.tinfo.write(oprot);
-        }
-        if (struct.isSetCredentials()) {
-          struct.credentials.write(oprot);
-        }
-        if (struct.isSetTableName()) {
-          oprot.writeString(struct.tableName);
-        }
-        if (struct.isSetStartRow()) {
-          oprot.writeBinary(struct.startRow);
-        }
-        if (struct.isSetEndRow()) {
-          oprot.writeBinary(struct.endRow);
-        }
-        if (struct.isSetFlushID()) {
-          oprot.writeI64(struct.flushID);
-        }
-        if (struct.isSetMaxLoops()) {
-          oprot.writeI64(struct.maxLoops);
-        }
-      }
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(7);
-        if (incoming.get(0)) {
-          struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo();
-          struct.tinfo.read(iprot);
-          struct.setTinfoIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials();
-          struct.credentials.read(iprot);
-          struct.setCredentialsIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.tableName = iprot.readString();
-          struct.setTableNameIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.startRow = iprot.readBinary();
-          struct.setStartRowIsSet(true);
-        }
-        if (incoming.get(4)) {
-          struct.endRow = iprot.readBinary();
-          struct.setEndRowIsSet(true);
-        }
-        if (incoming.get(5)) {
-          struct.flushID = iprot.readI64();
-          struct.setFlushIDIsSet(true);
-        }
-        if (incoming.get(6)) {
-          struct.maxLoops = iprot.readI64();
-          struct.setMaxLoopsIsSet(true);
-        }
-      }
-    }
-
-    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-    }
-  }
-
-  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class waitForFlush_result implements org.apache.thrift.TBase<waitForFlush_result, waitForFlush_result._Fields>, java.io.Serializable, Cloneable, Comparable<waitForFlush_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_result");
-
-    private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_resultTupleSchemeFactory();
-
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      SEC((short)1, "sec"),
-      TOPE((short)2, "tope"),
-      TNASE((short)3, "tnase");
-
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-      static {
-        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      @org.apache.thrift.annotation.Nullable
-      public static _Fields findByThriftId(int fieldId) {
-        switch(fieldId) {
-          case 1: // SEC
-            return SEC;
-          case 2: // TOPE
-            return TOPE;
-          case 3: // TNASE
-            return TNASE;
-          default:
-            return null;
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, throwing an exception
-       * if it is not found.
-       */
-      public static _Fields findByThriftIdOrThrow(int fieldId) {
-        _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-        return fields;
-      }
-
-      /**
-       * Find the _Fields constant that matches name, or null if its not found.
-       */
-      @org.apache.thrift.annotation.Nullable
-      public static _Fields findByName(java.lang.String name) {
-        return byName.get(name);
-      }
-
-      private final short _thriftId;
-      private final java.lang.String _fieldName;
-
-      _Fields(short thriftId, java.lang.String fieldName) {
-        _thriftId = thriftId;
-        _fieldName = fieldName;
-      }
-
-      @Override
-      public short getThriftFieldId() {
-        return _thriftId;
-      }
-
-      @Override
-      public java.lang.String getFieldName() {
-        return _fieldName;
-      }
-    }
-
-    // isset id assignments
-    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-    static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class)));
-      tmpMap.put(_Fields.TOPE, new org.apache.thrift.meta_data.FieldMetaData("tope", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
-      tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
-      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_result.class, metaDataMap);
-    }
-
-    public waitForFlush_result() {
-    }
-
-    public waitForFlush_result(
-      org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
-    {
-      this();
-      this.sec = sec;
-      this.tope = tope;
-      this.tnase = tnase;
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public waitForFlush_result(waitForFlush_result other) {
-      if (other.isSetSec()) {
-        this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
-      }
-      if (other.isSetTope()) {
-        this.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(other.tope);
-      }
-      if (other.isSetTnase()) {
-        this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
-      }
-    }
-
-    @Override
-    public waitForFlush_result deepCopy() {
-      return new waitForFlush_result(this);
-    }
-
-    @Override
-    public void clear() {
-      this.sec = null;
-      this.tope = null;
-      this.tnase = null;
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec() {
-      return this.sec;
-    }
-
-    public waitForFlush_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
-      this.sec = sec;
-      return this;
-    }
-
-    public void unsetSec() {
-      this.sec = null;
-    }
-
-    /** Returns true if field sec is set (has been assigned a value) and false otherwise */
-    public boolean isSetSec() {
-      return this.sec != null;
-    }
-
-    public void setSecIsSet(boolean value) {
-      if (!value) {
-        this.sec = null;
-      }
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException getTope() {
-      return this.tope;
-    }
-
-    public waitForFlush_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
-      this.tope = tope;
-      return this;
-    }
-
-    public void unsetTope() {
-      this.tope = null;
-    }
-
-    /** Returns true if field tope is set (has been assigned a value) and false otherwise */
-    public boolean isSetTope() {
-      return this.tope != null;
-    }
-
-    public void setTopeIsSet(boolean value) {
-      if (!value) {
-        this.tope = null;
-      }
-    }
-
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException getTnase() {
-      return this.tnase;
-    }
-
-    public waitForFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public initiateFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -8280,6 +6408,14 @@ public class ManagerClientService {
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((java.lang.Long)value);
+        }
+        break;
+
       case SEC:
         if (value == null) {
           unsetSec();
@@ -8311,6 +6447,9 @@ public class ManagerClientService {
     @Override
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
       case SEC:
         return getSec();
 
@@ -8332,6 +6471,8 @@ public class ManagerClientService {
       }
 
       switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
       case SEC:
         return isSetSec();
       case TOPE:
@@ -8344,17 +6485,26 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof waitForFlush_result)
-        return this.equals((waitForFlush_result)that);
+      if (that instanceof initiateFlush_result)
+        return this.equals((initiateFlush_result)that);
       return false;
     }
 
-    public boolean equals(waitForFlush_result that) {
+    public boolean equals(initiateFlush_result that) {
       if (that == null)
         return false;
       if (this == that)
         return true;
 
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
       boolean this_present_sec = true && this.isSetSec();
       boolean that_present_sec = true && that.isSetSec();
       if (this_present_sec || that_present_sec) {
@@ -8389,6 +6539,8 @@ public class ManagerClientService {
     public int hashCode() {
       int hashCode = 1;
 
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success);
+
       hashCode = hashCode * 8191 + ((isSetSec()) ? 131071 : 524287);
       if (isSetSec())
         hashCode = hashCode * 8191 + sec.hashCode();
@@ -8405,13 +6557,23 @@ public class ManagerClientService {
     }
 
     @Override
-    public int compareTo(waitForFlush_result other) {
+    public int compareTo(initiateFlush_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
 
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
@@ -8462,9 +6624,13 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("initiateFlush_result(");
       boolean first = true;
 
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("sec:");
       if (this.sec == null) {
         sb.append("null");
@@ -8507,23 +6673,25 @@ public class ManagerClientService {
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
       }
     }
 
-    private static class waitForFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class initiateFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public waitForFlush_resultStandardScheme getScheme() {
-        return new waitForFlush_resultStandardScheme();
+      public initiateFlush_resultStandardScheme getScheme() {
+        return new initiateFlush_resultStandardScheme();
       }
     }
 
-    private static class waitForFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<waitForFlush_result> {
+    private static class initiateFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<initiateFlush_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, initiateFlush_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -8533,6 +6701,14 @@ public class ManagerClientService {
             break;
           }
           switch (schemeField.id) {
+            case 0: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.success = iprot.readI64();
+                struct.setSuccessIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             case 1: // SEC
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
                 struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
@@ -8572,10 +6748,15 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, initiateFlush_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.isSetSuccess()) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeI64(struct.success);
+          oprot.writeFieldEnd();
+        }
         if (struct.sec != null) {
           oprot.writeFieldBegin(SEC_FIELD_DESC);
           struct.sec.write(oprot);
@@ -8597,29 +6778,35 @@ public class ManagerClientService {
 
     }
 
-    private static class waitForFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class initiateFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public waitForFlush_resultTupleScheme getScheme() {
-        return new waitForFlush_resultTupleScheme();
+      public initiateFlush_resultTupleScheme getScheme() {
+        return new initiateFlush_resultTupleScheme();
       }
     }
 
-    private static class waitForFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<waitForFlush_result> {
+    private static class initiateFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<initiateFlush_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
-        if (struct.isSetSec()) {
+        if (struct.isSetSuccess()) {
           optionals.set(0);
         }
-        if (struct.isSetTope()) {
+        if (struct.isSetSec()) {
           optionals.set(1);
         }
-        if (struct.isSetTnase()) {
+        if (struct.isSetTope()) {
           optionals.set(2);
         }
-        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetTnase()) {
+          optionals.set(3);
+        }
+        oprot.writeBitSet(optionals, 4);
+        if (struct.isSetSuccess()) {
+          oprot.writeI64(struct.success);
+        }
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -8632,20 +6819,24 @@ public class ManagerClientService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
+          struct.success = iprot.readI64();
+          struct.setSuccessIsSet(true);
+        }
+        if (incoming.get(1)) {
           struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
           struct.sec.read(iprot);
           struct.setSecIsSet(true);
         }
-        if (incoming.get(1)) {
+        if (incoming.get(2)) {
           struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException();
           struct.tope.read(iprot);
           struct.setTopeIsSet(true);
         }
-        if (incoming.get(2)) {
+        if (incoming.get(3)) {
           struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException();
           struct.tnase.read(iprot);
           struct.setTnaseIsSet(true);
@@ -8659,31 +6850,37 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class setTableProperty_args implements org.apache.thrift.TBase<setTableProperty_args, setTableProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<setTableProperty_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_args");
+  public static class waitForFlush_args implements org.apache.thrift.TBase<waitForFlush_args, waitForFlush_args._Fields>, java.io.Serializable, Cloneable, Comparable<waitForFlush_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4);
-    private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5);
+    private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)4);
+    private static final org.apache.thrift.protocol.TField END_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("endRow", org.apache.thrift.protocol.TType.STRING, (short)5);
+    private static final org.apache.thrift.protocol.TField FLUSH_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("flushID", org.apache.thrift.protocol.TType.I64, (short)6);
+    private static final org.apache.thrift.protocol.TField MAX_LOOPS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxLoops", org.apache.thrift.protocol.TType.I64, (short)7);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_argsTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
     public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String property; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String value; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow; // required
+    public long flushID; // required
+    public long maxLoops; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
       CREDENTIALS((short)2, "credentials"),
       TABLE_NAME((short)3, "tableName"),
-      PROPERTY((short)4, "property"),
-      VALUE((short)5, "value");
+      START_ROW((short)4, "startRow"),
+      END_ROW((short)5, "endRow"),
+      FLUSH_ID((short)6, "flushID"),
+      MAX_LOOPS((short)7, "maxLoops");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -8705,10 +6902,14 @@ public class ManagerClientService {
             return CREDENTIALS;
           case 3: // TABLE_NAME
             return TABLE_NAME;
-          case 4: // PROPERTY
-            return PROPERTY;
-          case 5: // VALUE
-            return VALUE;
+          case 4: // START_ROW
+            return START_ROW;
+          case 5: // END_ROW
+            return END_ROW;
+          case 6: // FLUSH_ID
+            return FLUSH_ID;
+          case 7: // MAX_LOOPS
+            return MAX_LOOPS;
           default:
             return null;
         }
@@ -8752,6 +6953,9 @@ public class ManagerClientService {
     }
 
     // isset id assignments
+    private static final int __FLUSHID_ISSET_ID = 0;
+    private static final int __MAXLOOPS_ISSET_ID = 1;
+    private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -8761,36 +6965,47 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
       tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
+      tmpMap.put(_Fields.END_ROW, new org.apache.thrift.meta_data.FieldMetaData("endRow", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
+      tmpMap.put(_Fields.FLUSH_ID, new org.apache.thrift.meta_data.FieldMetaData("flushID", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+      tmpMap.put(_Fields.MAX_LOOPS, new org.apache.thrift.meta_data.FieldMetaData("maxLoops", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_args.class, metaDataMap);
     }
 
-    public setTableProperty_args() {
+    public waitForFlush_args() {
     }
 
-    public setTableProperty_args(
+    public waitForFlush_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
       java.lang.String tableName,
-      java.lang.String property,
-      java.lang.String value)
+      java.nio.ByteBuffer startRow,
+      java.nio.ByteBuffer endRow,
+      long flushID,
+      long maxLoops)
     {
       this();
       this.tinfo = tinfo;
       this.credentials = credentials;
       this.tableName = tableName;
-      this.property = property;
-      this.value = value;
+      this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
+      this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
+      this.flushID = flushID;
+      setFlushIDIsSet(true);
+      this.maxLoops = maxLoops;
+      setMaxLoopsIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setTableProperty_args(setTableProperty_args other) {
+    public waitForFlush_args(waitForFlush_args other) {
+      __isset_bitfield = other.__isset_bitfield;
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
       }
@@ -8800,17 +7015,19 @@ public class ManagerClientService {
       if (other.isSetTableName()) {
         this.tableName = other.tableName;
       }
-      if (other.isSetProperty()) {
-        this.property = other.property;
+      if (other.isSetStartRow()) {
+        this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow);
       }
-      if (other.isSetValue()) {
-        this.value = other.value;
+      if (other.isSetEndRow()) {
+        this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow);
       }
+      this.flushID = other.flushID;
+      this.maxLoops = other.maxLoops;
     }
 
     @Override
-    public setTableProperty_args deepCopy() {
-      return new setTableProperty_args(this);
+    public waitForFlush_args deepCopy() {
+      return new waitForFlush_args(this);
     }
 
     @Override
@@ -8818,8 +7035,12 @@ public class ManagerClientService {
       this.tinfo = null;
       this.credentials = null;
       this.tableName = null;
-      this.property = null;
-      this.value = null;
+      this.startRow = null;
+      this.endRow = null;
+      setFlushIDIsSet(false);
+      this.flushID = 0;
+      setMaxLoopsIsSet(false);
+      this.maxLoops = 0;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -8827,7 +7048,7 @@ public class ManagerClientService {
       return this.tinfo;
     }
 
-    public setTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
+    public waitForFlush_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
       this.tinfo = tinfo;
       return this;
     }
@@ -8852,7 +7073,7 @@ public class ManagerClientService {
       return this.credentials;
     }
 
-    public setTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+    public waitForFlush_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -8877,7 +7098,7 @@ public class ManagerClientService {
       return this.tableName;
     }
 
-    public setTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
+    public waitForFlush_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
       this.tableName = tableName;
       return this;
     }
@@ -8897,56 +7118,120 @@ public class ManagerClientService {
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public java.lang.String getProperty() {
-      return this.property;
+    public byte[] getStartRow() {
+      setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow));
+      return startRow == null ? null : startRow.array();
     }
 
-    public setTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
-      this.property = property;
+    public java.nio.ByteBuffer bufferForStartRow() {
+      return org.apache.thrift.TBaseHelper.copyBinary(startRow);
+    }
+
+    public waitForFlush_args setStartRow(byte[] startRow) {
+      this.startRow = startRow == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(startRow.clone());
       return this;
     }
 
-    public void unsetProperty() {
-      this.property = null;
+    public waitForFlush_args setStartRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow) {
+      this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
+      return this;
     }
 
-    /** Returns true if field property is set (has been assigned a value) and false otherwise */
-    public boolean isSetProperty() {
-      return this.property != null;
+    public void unsetStartRow() {
+      this.startRow = null;
     }
 
-    public void setPropertyIsSet(boolean value) {
+    /** Returns true if field startRow is set (has been assigned a value) and false otherwise */
+    public boolean isSetStartRow() {
+      return this.startRow != null;
+    }
+
+    public void setStartRowIsSet(boolean value) {
       if (!value) {
-        this.property = null;
+        this.startRow = null;
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public java.lang.String getValue() {
-      return this.value;
+    public byte[] getEndRow() {
+      setEndRow(org.apache.thrift.TBaseHelper.rightSize(endRow));
+      return endRow == null ? null : endRow.array();
     }
 
-    public setTableProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) {
-      this.value = value;
+    public java.nio.ByteBuffer bufferForEndRow() {
+      return org.apache.thrift.TBaseHelper.copyBinary(endRow);
+    }
+
+    public waitForFlush_args setEndRow(byte[] endRow) {
+      this.endRow = endRow == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(endRow.clone());
       return this;
     }
 
-    public void unsetValue() {
-      this.value = null;
+    public waitForFlush_args setEndRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow) {
+      this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
+      return this;
     }
 
-    /** Returns true if field value is set (has been assigned a value) and false otherwise */
-    public boolean isSetValue() {
-      return this.value != null;
+    public void unsetEndRow() {
+      this.endRow = null;
     }
 
-    public void setValueIsSet(boolean value) {
+    /** Returns true if field endRow is set (has been assigned a value) and false otherwise */
+    public boolean isSetEndRow() {
+      return this.endRow != null;
+    }
+
+    public void setEndRowIsSet(boolean value) {
       if (!value) {
-        this.value = null;
+        this.endRow = null;
       }
     }
 
+    public long getFlushID() {
+      return this.flushID;
+    }
+
+    public waitForFlush_args setFlushID(long flushID) {
+      this.flushID = flushID;
+      setFlushIDIsSet(true);
+      return this;
+    }
+
+    public void unsetFlushID() {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FLUSHID_ISSET_ID);
+    }
+
+    /** Returns true if field flushID is set (has been assigned a value) and false otherwise */
+    public boolean isSetFlushID() {
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FLUSHID_ISSET_ID);
+    }
+
+    public void setFlushIDIsSet(boolean value) {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FLUSHID_ISSET_ID, value);
+    }
+
+    public long getMaxLoops() {
+      return this.maxLoops;
+    }
+
+    public waitForFlush_args setMaxLoops(long maxLoops) {
+      this.maxLoops = maxLoops;
+      setMaxLoopsIsSet(true);
+      return this;
+    }
+
+    public void unsetMaxLoops() {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXLOOPS_ISSET_ID);
+    }
+
+    /** Returns true if field maxLoops is set (has been assigned a value) and false otherwise */
+    public boolean isSetMaxLoops() {
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXLOOPS_ISSET_ID);
+    }
+
+    public void setMaxLoopsIsSet(boolean value) {
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXLOOPS_ISSET_ID, value);
+    }
+
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
@@ -8974,19 +7259,43 @@ public class ManagerClientService {
         }
         break;
 
-      case PROPERTY:
+      case START_ROW:
         if (value == null) {
-          unsetProperty();
+          unsetStartRow();
         } else {
-          setProperty((java.lang.String)value);
+          if (value instanceof byte[]) {
+            setStartRow((byte[])value);
+          } else {
+            setStartRow((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
-      case VALUE:
+      case END_ROW:
         if (value == null) {
-          unsetValue();
+          unsetEndRow();
         } else {
-          setValue((java.lang.String)value);
+          if (value instanceof byte[]) {
+            setEndRow((byte[])value);
+          } else {
+            setEndRow((java.nio.ByteBuffer)value);
+          }
+        }
+        break;
+
+      case FLUSH_ID:
+        if (value == null) {
+          unsetFlushID();
+        } else {
+          setFlushID((java.lang.Long)value);
+        }
+        break;
+
+      case MAX_LOOPS:
+        if (value == null) {
+          unsetMaxLoops();
+        } else {
+          setMaxLoops((java.lang.Long)value);
         }
         break;
 
@@ -9006,11 +7315,17 @@ public class ManagerClientService {
       case TABLE_NAME:
         return getTableName();
 
-      case PROPERTY:
-        return getProperty();
+      case START_ROW:
+        return getStartRow();
 
-      case VALUE:
-        return getValue();
+      case END_ROW:
+        return getEndRow();
+
+      case FLUSH_ID:
+        return getFlushID();
+
+      case MAX_LOOPS:
+        return getMaxLoops();
 
       }
       throw new java.lang.IllegalStateException();
@@ -9030,22 +7345,26 @@ public class ManagerClientService {
         return isSetCredentials();
       case TABLE_NAME:
         return isSetTableName();
-      case PROPERTY:
-        return isSetProperty();
-      case VALUE:
-        return isSetValue();
+      case START_ROW:
+        return isSetStartRow();
+      case END_ROW:
+        return isSetEndRow();
+      case FLUSH_ID:
+        return isSetFlushID();
+      case MAX_LOOPS:
+        return isSetMaxLoops();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof setTableProperty_args)
-        return this.equals((setTableProperty_args)that);
+      if (that instanceof waitForFlush_args)
+        return this.equals((waitForFlush_args)that);
       return false;
     }
 
-    public boolean equals(setTableProperty_args that) {
+    public boolean equals(waitForFlush_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -9078,21 +7397,39 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_property = true && this.isSetProperty();
-      boolean that_present_property = true && that.isSetProperty();
-      if (this_present_property || that_present_property) {
-        if (!(this_present_property && that_present_property))
+      boolean this_present_startRow = true && this.isSetStartRow();
+      boolean that_present_startRow = true && that.isSetStartRow();
+      if (this_present_startRow || that_present_startRow) {
+        if (!(this_present_startRow && that_present_startRow))
           return false;
-        if (!this.property.equals(that.property))
+        if (!this.startRow.equals(that.startRow))
           return false;
       }
 
-      boolean this_present_value = true && this.isSetValue();
-      boolean that_present_value = true && that.isSetValue();
-      if (this_present_value || that_present_value) {
-        if (!(this_present_value && that_present_value))
+      boolean this_present_endRow = true && this.isSetEndRow();
+      boolean that_present_endRow = true && that.isSetEndRow();
+      if (this_present_endRow || that_present_endRow) {
+        if (!(this_present_endRow && that_present_endRow))
           return false;
-        if (!this.value.equals(that.value))
+        if (!this.endRow.equals(that.endRow))
+          return false;
+      }
+
+      boolean this_present_flushID = true;
+      boolean that_present_flushID = true;
+      if (this_present_flushID || that_present_flushID) {
+        if (!(this_present_flushID && that_present_flushID))
+          return false;
+        if (this.flushID != that.flushID)
+          return false;
+      }
+
+      boolean this_present_maxLoops = true;
+      boolean that_present_maxLoops = true;
+      if (this_present_maxLoops || that_present_maxLoops) {
+        if (!(this_present_maxLoops && that_present_maxLoops))
+          return false;
+        if (this.maxLoops != that.maxLoops)
           return false;
       }
 
@@ -9115,19 +7452,23 @@ public class ManagerClientService {
       if (isSetTableName())
         hashCode = hashCode * 8191 + tableName.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287);
-      if (isSetProperty())
-        hashCode = hashCode * 8191 + property.hashCode();
+      hashCode = hashCode * 8191 + ((isSetStartRow()) ? 131071 : 524287);
+      if (isSetStartRow())
+        hashCode = hashCode * 8191 + startRow.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
-      if (isSetValue())
-        hashCode = hashCode * 8191 + value.hashCode();
+      hashCode = hashCode * 8191 + ((isSetEndRow()) ? 131071 : 524287);
+      if (isSetEndRow())
+        hashCode = hashCode * 8191 + endRow.hashCode();
+
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(flushID);
+
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(maxLoops);
 
       return hashCode;
     }
 
     @Override
-    public int compareTo(setTableProperty_args other) {
+    public int compareTo(waitForFlush_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -9164,22 +7505,42 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetStartRow(), other.isSetStartRow());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetProperty()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property);
+      if (isSetStartRow()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
+      lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetValue()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
+      if (isSetEndRow()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endRow, other.endRow);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetFlushID(), other.isSetFlushID());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFlushID()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.flushID, other.flushID);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetMaxLoops(), other.isSetMaxLoops());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetMaxLoops()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxLoops, other.maxLoops);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -9205,7 +7566,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_args(");
       boolean first = true;
 
       sb.append("tinfo:");
@@ -9232,21 +7593,29 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("property:");
-      if (this.property == null) {
+      sb.append("startRow:");
+      if (this.startRow == null) {
         sb.append("null");
       } else {
-        sb.append(this.property);
+        org.apache.thrift.TBaseHelper.toString(this.startRow, sb);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("value:");
-      if (this.value == null) {
+      sb.append("endRow:");
+      if (this.endRow == null) {
         sb.append("null");
       } else {
-        sb.append(this.value);
+        org.apache.thrift.TBaseHelper.toString(this.endRow, sb);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("flushID:");
+      sb.append(this.flushID);
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("maxLoops:");
+      sb.append(this.maxLoops);
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -9272,23 +7641,25 @@ public class ManagerClientService {
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
       }
     }
 
-    private static class setTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class waitForFlush_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setTableProperty_argsStandardScheme getScheme() {
-        return new setTableProperty_argsStandardScheme();
+      public waitForFlush_argsStandardScheme getScheme() {
+        return new waitForFlush_argsStandardScheme();
       }
     }
 
-    private static class setTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setTableProperty_args> {
+    private static class waitForFlush_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<waitForFlush_args> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -9324,18 +7695,34 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // PROPERTY
+            case 4: // START_ROW
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.property = iprot.readString();
-                struct.setPropertyIsSet(true);
+                struct.startRow = iprot.readBinary();
+                struct.setStartRowIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 5: // VALUE
+            case 5: // END_ROW
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.value = iprot.readString();
-                struct.setValueIsSet(true);
+                struct.endRow = iprot.readBinary();
+                struct.setEndRowIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 6: // FLUSH_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.flushID = iprot.readI64();
+                struct.setFlushIDIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 7: // MAX_LOOPS
+              if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+                struct.maxLoops = iprot.readI64();
+                struct.setMaxLoopsIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -9352,7 +7739,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -9371,33 +7758,39 @@ public class ManagerClientService {
           oprot.writeString(struct.tableName);
           oprot.writeFieldEnd();
         }
-        if (struct.property != null) {
-          oprot.writeFieldBegin(PROPERTY_FIELD_DESC);
-          oprot.writeString(struct.property);
+        if (struct.startRow != null) {
+          oprot.writeFieldBegin(START_ROW_FIELD_DESC);
+          oprot.writeBinary(struct.startRow);
           oprot.writeFieldEnd();
         }
-        if (struct.value != null) {
-          oprot.writeFieldBegin(VALUE_FIELD_DESC);
-          oprot.writeString(struct.value);
+        if (struct.endRow != null) {
+          oprot.writeFieldBegin(END_ROW_FIELD_DESC);
+          oprot.writeBinary(struct.endRow);
           oprot.writeFieldEnd();
         }
+        oprot.writeFieldBegin(FLUSH_ID_FIELD_DESC);
+        oprot.writeI64(struct.flushID);
+        oprot.writeFieldEnd();
+        oprot.writeFieldBegin(MAX_LOOPS_FIELD_DESC);
+        oprot.writeI64(struct.maxLoops);
+        oprot.writeFieldEnd();
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class setTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class waitForFlush_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setTableProperty_argsTupleScheme getScheme() {
-        return new setTableProperty_argsTupleScheme();
+      public waitForFlush_argsTupleScheme getScheme() {
+        return new waitForFlush_argsTupleScheme();
       }
     }
 
-    private static class setTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setTableProperty_args> {
+    private static class waitForFlush_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<waitForFlush_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetTinfo()) {
@@ -9409,13 +7802,19 @@ public class ManagerClientService {
         if (struct.isSetTableName()) {
           optionals.set(2);
         }
-        if (struct.isSetProperty()) {
+        if (struct.isSetStartRow()) {
           optionals.set(3);
         }
-        if (struct.isSetValue()) {
+        if (struct.isSetEndRow()) {
           optionals.set(4);
         }
-        oprot.writeBitSet(optionals, 5);
+        if (struct.isSetFlushID()) {
+          optionals.set(5);
+        }
+        if (struct.isSetMaxLoops()) {
+          optionals.set(6);
+        }
+        oprot.writeBitSet(optionals, 7);
         if (struct.isSetTinfo()) {
           struct.tinfo.write(oprot);
         }
@@ -9425,18 +7824,24 @@ public class ManagerClientService {
         if (struct.isSetTableName()) {
           oprot.writeString(struct.tableName);
         }
-        if (struct.isSetProperty()) {
-          oprot.writeString(struct.property);
+        if (struct.isSetStartRow()) {
+          oprot.writeBinary(struct.startRow);
         }
-        if (struct.isSetValue()) {
-          oprot.writeString(struct.value);
+        if (struct.isSetEndRow()) {
+          oprot.writeBinary(struct.endRow);
+        }
+        if (struct.isSetFlushID()) {
+          oprot.writeI64(struct.flushID);
+        }
+        if (struct.isSetMaxLoops()) {
+          oprot.writeI64(struct.maxLoops);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(5);
+        java.util.BitSet incoming = iprot.readBitSet(7);
         if (incoming.get(0)) {
           struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo();
           struct.tinfo.read(iprot);
@@ -9452,12 +7857,20 @@ public class ManagerClientService {
           struct.setTableNameIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.property = iprot.readString();
-          struct.setPropertyIsSet(true);
+          struct.startRow = iprot.readBinary();
+          struct.setStartRowIsSet(true);
         }
         if (incoming.get(4)) {
-          struct.value = iprot.readString();
-          struct.setValueIsSet(true);
+          struct.endRow = iprot.readBinary();
+          struct.setEndRowIsSet(true);
+        }
+        if (incoming.get(5)) {
+          struct.flushID = iprot.readI64();
+          struct.setFlushIDIsSet(true);
+        }
+        if (incoming.get(6)) {
+          struct.maxLoops = iprot.readI64();
+          struct.setMaxLoopsIsSet(true);
         }
       }
     }
@@ -9468,28 +7881,25 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class setTableProperty_result implements org.apache.thrift.TBase<setTableProperty_result, setTableProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<setTableProperty_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_result");
+  public static class waitForFlush_result implements org.apache.thrift.TBase<waitForFlush_result, waitForFlush_result._Fields>, java.io.Serializable, Cloneable, Comparable<waitForFlush_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_result");
 
     private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_resultTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
-    public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SEC((short)1, "sec"),
       TOPE((short)2, "tope"),
-      TNASE((short)3, "tnase"),
-      TPE((short)4, "tpe");
+      TNASE((short)3, "tnase");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -9511,8 +7921,6 @@ public class ManagerClientService {
             return TOPE;
           case 3: // TNASE
             return TNASE;
-          case 4: // TPE
-            return TPE;
           default:
             return null;
         }
@@ -9565,32 +7973,28 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
       tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
-      tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_result.class, metaDataMap);
     }
 
-    public setTableProperty_result() {
+    public waitForFlush_result() {
     }
 
-    public setTableProperty_result(
+    public waitForFlush_result(
       org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
       org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase,
-      ThriftPropertyException tpe)
+      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
     {
       this();
       this.sec = sec;
       this.tope = tope;
       this.tnase = tnase;
-      this.tpe = tpe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setTableProperty_result(setTableProperty_result other) {
+    public waitForFlush_result(waitForFlush_result other) {
       if (other.isSetSec()) {
         this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
       }
@@ -9600,14 +8004,11 @@ public class ManagerClientService {
       if (other.isSetTnase()) {
         this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
       }
-      if (other.isSetTpe()) {
-        this.tpe = new ThriftPropertyException(other.tpe);
-      }
     }
 
     @Override
-    public setTableProperty_result deepCopy() {
-      return new setTableProperty_result(this);
+    public waitForFlush_result deepCopy() {
+      return new waitForFlush_result(this);
     }
 
     @Override
@@ -9615,7 +8016,6 @@ public class ManagerClientService {
       this.sec = null;
       this.tope = null;
       this.tnase = null;
-      this.tpe = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -9623,7 +8023,7 @@ public class ManagerClientService {
       return this.sec;
     }
 
-    public setTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+    public waitForFlush_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
       this.sec = sec;
       return this;
     }
@@ -9648,7 +8048,7 @@ public class ManagerClientService {
       return this.tope;
     }
 
-    public setTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
+    public waitForFlush_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
       this.tope = tope;
       return this;
     }
@@ -9673,7 +8073,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public setTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public waitForFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -9693,31 +8093,6 @@ public class ManagerClientService {
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public ThriftPropertyException getTpe() {
-      return this.tpe;
-    }
-
-    public setTableProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
-      this.tpe = tpe;
-      return this;
-    }
-
-    public void unsetTpe() {
-      this.tpe = null;
-    }
-
-    /** Returns true if field tpe is set (has been assigned a value) and false otherwise */
-    public boolean isSetTpe() {
-      return this.tpe != null;
-    }
-
-    public void setTpeIsSet(boolean value) {
-      if (!value) {
-        this.tpe = null;
-      }
-    }
-
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
@@ -9745,14 +8120,6 @@ public class ManagerClientService {
         }
         break;
 
-      case TPE:
-        if (value == null) {
-          unsetTpe();
-        } else {
-          setTpe((ThriftPropertyException)value);
-        }
-        break;
-
       }
     }
 
@@ -9769,9 +8136,6 @@ public class ManagerClientService {
       case TNASE:
         return getTnase();
 
-      case TPE:
-        return getTpe();
-
       }
       throw new java.lang.IllegalStateException();
     }
@@ -9790,20 +8154,18 @@ public class ManagerClientService {
         return isSetTope();
       case TNASE:
         return isSetTnase();
-      case TPE:
-        return isSetTpe();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof setTableProperty_result)
-        return this.equals((setTableProperty_result)that);
+      if (that instanceof waitForFlush_result)
+        return this.equals((waitForFlush_result)that);
       return false;
     }
 
-    public boolean equals(setTableProperty_result that) {
+    public boolean equals(waitForFlush_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -9836,15 +8198,6 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_tpe = true && this.isSetTpe();
-      boolean that_present_tpe = true && that.isSetTpe();
-      if (this_present_tpe || that_present_tpe) {
-        if (!(this_present_tpe && that_present_tpe))
-          return false;
-        if (!this.tpe.equals(that.tpe))
-          return false;
-      }
-
       return true;
     }
 
@@ -9864,15 +8217,11 @@ public class ManagerClientService {
       if (isSetTnase())
         hashCode = hashCode * 8191 + tnase.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
-      if (isSetTpe())
-        hashCode = hashCode * 8191 + tpe.hashCode();
-
       return hashCode;
     }
 
     @Override
-    public int compareTo(setTableProperty_result other) {
+    public int compareTo(waitForFlush_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -9909,16 +8258,6 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTpe()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -9939,7 +8278,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_result(");
       boolean first = true;
 
       sb.append("sec:");
@@ -9965,14 +8304,6 @@ public class ManagerClientService {
         sb.append(this.tnase);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("tpe:");
-      if (this.tpe == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tpe);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -9998,17 +8329,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class setTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class waitForFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setTableProperty_resultStandardScheme getScheme() {
-        return new setTableProperty_resultStandardScheme();
+      public waitForFlush_resultStandardScheme getScheme() {
+        return new waitForFlush_resultStandardScheme();
       }
     }
 
-    private static class setTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setTableProperty_result> {
+    private static class waitForFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<waitForFlush_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -10045,15 +8376,6 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // TPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tpe = new ThriftPropertyException();
-                struct.tpe.read(iprot);
-                struct.setTpeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -10066,7 +8388,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -10085,28 +8407,23 @@ public class ManagerClientService {
           struct.tnase.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.tpe != null) {
-          oprot.writeFieldBegin(TPE_FIELD_DESC);
-          struct.tpe.write(oprot);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class setTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class waitForFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setTableProperty_resultTupleScheme getScheme() {
-        return new setTableProperty_resultTupleScheme();
+      public waitForFlush_resultTupleScheme getScheme() {
+        return new waitForFlush_resultTupleScheme();
       }
     }
 
-    private static class setTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setTableProperty_result> {
+    private static class waitForFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<waitForFlush_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSec()) {
@@ -10118,10 +8435,7 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           optionals.set(2);
         }
-        if (struct.isSetTpe()) {
-          optionals.set(3);
-        }
-        oprot.writeBitSet(optionals, 4);
+        oprot.writeBitSet(optionals, 3);
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -10131,15 +8445,12 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           struct.tnase.write(oprot);
         }
-        if (struct.isSetTpe()) {
-          struct.tpe.write(oprot);
-        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
           struct.sec.read(iprot);
@@ -10155,11 +8466,6 @@ public class ManagerClientService {
           struct.tnase.read(iprot);
           struct.setTnaseIsSet(true);
         }
-        if (incoming.get(3)) {
-          struct.tpe = new ThriftPropertyException();
-          struct.tpe.read(iprot);
-          struct.setTpeIsSet(true);
-        }
       }
     }
 
@@ -10169,28 +8475,31 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class modifyTableProperties_args implements org.apache.thrift.TBase<modifyTableProperties_args, modifyTableProperties_args._Fields>, java.io.Serializable, Cloneable, Comparable<modifyTableProperties_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_args");
+  public static class setTableProperty_args implements org.apache.thrift.TBase<setTableProperty_args, setTableProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<setTableProperty_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4);
+    private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_argsTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
     public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String property; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String value; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
       CREDENTIALS((short)2, "credentials"),
       TABLE_NAME((short)3, "tableName"),
-      V_PROPERTIES((short)4, "vProperties");
+      PROPERTY((short)4, "property"),
+      VALUE((short)5, "value");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -10212,8 +8521,10 @@ public class ManagerClientService {
             return CREDENTIALS;
           case 3: // TABLE_NAME
             return TABLE_NAME;
-          case 4: // V_PROPERTIES
-            return V_PROPERTIES;
+          case 4: // PROPERTY
+            return PROPERTY;
+          case 5: // VALUE
+            return VALUE;
           default:
             return null;
         }
@@ -10266,32 +8577,36 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
       tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class)));
+      tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_args.class, metaDataMap);
     }
 
-    public modifyTableProperties_args() {
+    public setTableProperty_args() {
     }
 
-    public modifyTableProperties_args(
+    public setTableProperty_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
       java.lang.String tableName,
-      org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties)
+      java.lang.String property,
+      java.lang.String value)
     {
       this();
       this.tinfo = tinfo;
       this.credentials = credentials;
       this.tableName = tableName;
-      this.vProperties = vProperties;
+      this.property = property;
+      this.value = value;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public modifyTableProperties_args(modifyTableProperties_args other) {
+    public setTableProperty_args(setTableProperty_args other) {
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
       }
@@ -10301,14 +8616,17 @@ public class ManagerClientService {
       if (other.isSetTableName()) {
         this.tableName = other.tableName;
       }
-      if (other.isSetVProperties()) {
-        this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties);
+      if (other.isSetProperty()) {
+        this.property = other.property;
+      }
+      if (other.isSetValue()) {
+        this.value = other.value;
       }
     }
 
     @Override
-    public modifyTableProperties_args deepCopy() {
-      return new modifyTableProperties_args(this);
+    public setTableProperty_args deepCopy() {
+      return new setTableProperty_args(this);
     }
 
     @Override
@@ -10316,7 +8634,8 @@ public class ManagerClientService {
       this.tinfo = null;
       this.credentials = null;
       this.tableName = null;
-      this.vProperties = null;
+      this.property = null;
+      this.value = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -10324,7 +8643,7 @@ public class ManagerClientService {
       return this.tinfo;
     }
 
-    public modifyTableProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
+    public setTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
       this.tinfo = tinfo;
       return this;
     }
@@ -10349,7 +8668,7 @@ public class ManagerClientService {
       return this.credentials;
     }
 
-    public modifyTableProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+    public setTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -10374,7 +8693,7 @@ public class ManagerClientService {
       return this.tableName;
     }
 
-    public modifyTableProperties_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
+    public setTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
       this.tableName = tableName;
       return this;
     }
@@ -10395,27 +8714,52 @@ public class ManagerClientService {
     }
 
     @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() {
-      return this.vProperties;
+    public java.lang.String getProperty() {
+      return this.property;
     }
 
-    public modifyTableProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) {
-      this.vProperties = vProperties;
+    public setTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
+      this.property = property;
       return this;
     }
 
-    public void unsetVProperties() {
-      this.vProperties = null;
+    public void unsetProperty() {
+      this.property = null;
     }
 
-    /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */
-    public boolean isSetVProperties() {
-      return this.vProperties != null;
+    /** Returns true if field property is set (has been assigned a value) and false otherwise */
+    public boolean isSetProperty() {
+      return this.property != null;
     }
 
-    public void setVPropertiesIsSet(boolean value) {
+    public void setPropertyIsSet(boolean value) {
       if (!value) {
-        this.vProperties = null;
+        this.property = null;
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getValue() {
+      return this.value;
+    }
+
+    public setTableProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) {
+      this.value = value;
+      return this;
+    }
+
+    public void unsetValue() {
+      this.value = null;
+    }
+
+    /** Returns true if field value is set (has been assigned a value) and false otherwise */
+    public boolean isSetValue() {
+      return this.value != null;
+    }
+
+    public void setValueIsSet(boolean value) {
+      if (!value) {
+        this.value = null;
       }
     }
 
@@ -10446,11 +8790,19 @@ public class ManagerClientService {
         }
         break;
 
-      case V_PROPERTIES:
+      case PROPERTY:
         if (value == null) {
-          unsetVProperties();
+          unsetProperty();
         } else {
-          setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value);
+          setProperty((java.lang.String)value);
+        }
+        break;
+
+      case VALUE:
+        if (value == null) {
+          unsetValue();
+        } else {
+          setValue((java.lang.String)value);
         }
         break;
 
@@ -10470,8 +8822,11 @@ public class ManagerClientService {
       case TABLE_NAME:
         return getTableName();
 
-      case V_PROPERTIES:
-        return getVProperties();
+      case PROPERTY:
+        return getProperty();
+
+      case VALUE:
+        return getValue();
 
       }
       throw new java.lang.IllegalStateException();
@@ -10491,20 +8846,22 @@ public class ManagerClientService {
         return isSetCredentials();
       case TABLE_NAME:
         return isSetTableName();
-      case V_PROPERTIES:
-        return isSetVProperties();
+      case PROPERTY:
+        return isSetProperty();
+      case VALUE:
+        return isSetValue();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof modifyTableProperties_args)
-        return this.equals((modifyTableProperties_args)that);
+      if (that instanceof setTableProperty_args)
+        return this.equals((setTableProperty_args)that);
       return false;
     }
 
-    public boolean equals(modifyTableProperties_args that) {
+    public boolean equals(setTableProperty_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -10537,12 +8894,21 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_vProperties = true && this.isSetVProperties();
-      boolean that_present_vProperties = true && that.isSetVProperties();
-      if (this_present_vProperties || that_present_vProperties) {
-        if (!(this_present_vProperties && that_present_vProperties))
+      boolean this_present_property = true && this.isSetProperty();
+      boolean that_present_property = true && that.isSetProperty();
+      if (this_present_property || that_present_property) {
+        if (!(this_present_property && that_present_property))
           return false;
-        if (!this.vProperties.equals(that.vProperties))
+        if (!this.property.equals(that.property))
+          return false;
+      }
+
+      boolean this_present_value = true && this.isSetValue();
+      boolean that_present_value = true && that.isSetValue();
+      if (this_present_value || that_present_value) {
+        if (!(this_present_value && that_present_value))
+          return false;
+        if (!this.value.equals(that.value))
           return false;
       }
 
@@ -10565,15 +8931,19 @@ public class ManagerClientService {
       if (isSetTableName())
         hashCode = hashCode * 8191 + tableName.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287);
-      if (isSetVProperties())
-        hashCode = hashCode * 8191 + vProperties.hashCode();
+      hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287);
+      if (isSetProperty())
+        hashCode = hashCode * 8191 + property.hashCode();
+
+      hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+      if (isSetValue())
+        hashCode = hashCode * 8191 + value.hashCode();
 
       return hashCode;
     }
 
     @Override
-    public int compareTo(modifyTableProperties_args other) {
+    public int compareTo(setTableProperty_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -10610,12 +8980,22 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetVProperties()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties);
+      if (isSetProperty()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetValue()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -10641,7 +9021,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_args(");
       boolean first = true;
 
       sb.append("tinfo:");
@@ -10668,11 +9048,19 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("vProperties:");
-      if (this.vProperties == null) {
+      sb.append("property:");
+      if (this.property == null) {
         sb.append("null");
       } else {
-        sb.append(this.vProperties);
+        sb.append(this.property);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("value:");
+      if (this.value == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.value);
       }
       first = false;
       sb.append(")");
@@ -10688,9 +9076,6 @@ public class ManagerClientService {
       if (credentials != null) {
         credentials.validate();
       }
-      if (vProperties != null) {
-        vProperties.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -10709,17 +9094,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class modifyTableProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyTableProperties_argsStandardScheme getScheme() {
-        return new modifyTableProperties_argsStandardScheme();
+      public setTableProperty_argsStandardScheme getScheme() {
+        return new setTableProperty_argsStandardScheme();
       }
     }
 
-    private static class modifyTableProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyTableProperties_args> {
+    private static class setTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setTableProperty_args> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -10755,11 +9140,18 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // V_PROPERTIES
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
-                struct.vProperties.read(iprot);
-                struct.setVPropertiesIsSet(true);
+            case 4: // PROPERTY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.property = iprot.readString();
+                struct.setPropertyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.value = iprot.readString();
+                struct.setValueIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -10776,7 +9168,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -10795,9 +9187,14 @@ public class ManagerClientService {
           oprot.writeString(struct.tableName);
           oprot.writeFieldEnd();
         }
-        if (struct.vProperties != null) {
-          oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC);
-          struct.vProperties.write(oprot);
+        if (struct.property != null) {
+          oprot.writeFieldBegin(PROPERTY_FIELD_DESC);
+          oprot.writeString(struct.property);
+          oprot.writeFieldEnd();
+        }
+        if (struct.value != null) {
+          oprot.writeFieldBegin(VALUE_FIELD_DESC);
+          oprot.writeString(struct.value);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -10806,17 +9203,17 @@ public class ManagerClientService {
 
     }
 
-    private static class modifyTableProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyTableProperties_argsTupleScheme getScheme() {
-        return new modifyTableProperties_argsTupleScheme();
+      public setTableProperty_argsTupleScheme getScheme() {
+        return new setTableProperty_argsTupleScheme();
       }
     }
 
-    private static class modifyTableProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyTableProperties_args> {
+    private static class setTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setTableProperty_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetTinfo()) {
@@ -10828,10 +9225,13 @@ public class ManagerClientService {
         if (struct.isSetTableName()) {
           optionals.set(2);
         }
-        if (struct.isSetVProperties()) {
+        if (struct.isSetProperty()) {
           optionals.set(3);
         }
-        oprot.writeBitSet(optionals, 4);
+        if (struct.isSetValue()) {
+          optionals.set(4);
+        }
+        oprot.writeBitSet(optionals, 5);
         if (struct.isSetTinfo()) {
           struct.tinfo.write(oprot);
         }
@@ -10841,15 +9241,18 @@ public class ManagerClientService {
         if (struct.isSetTableName()) {
           oprot.writeString(struct.tableName);
         }
-        if (struct.isSetVProperties()) {
-          struct.vProperties.write(oprot);
+        if (struct.isSetProperty()) {
+          oprot.writeString(struct.property);
+        }
+        if (struct.isSetValue()) {
+          oprot.writeString(struct.value);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo();
           struct.tinfo.read(iprot);
@@ -10865,9 +9268,12 @@ public class ManagerClientService {
           struct.setTableNameIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
-          struct.vProperties.read(iprot);
-          struct.setVPropertiesIsSet(true);
+          struct.property = iprot.readString();
+          struct.setPropertyIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.value = iprot.readString();
+          struct.setValueIsSet(true);
         }
       }
     }
@@ -10878,22 +9284,20 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class modifyTableProperties_result implements org.apache.thrift.TBase<modifyTableProperties_result, modifyTableProperties_result._Fields>, java.io.Serializable, Cloneable, Comparable<modifyTableProperties_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_result");
+  public static class setTableProperty_result implements org.apache.thrift.TBase<setTableProperty_result, setTableProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<setTableProperty_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_result");
 
     private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-    private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_resultTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required
     public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -10901,8 +9305,7 @@ public class ManagerClientService {
       SEC((short)1, "sec"),
       TOPE((short)2, "tope"),
       TNASE((short)3, "tnase"),
-      TCME((short)4, "tcme"),
-      TPE((short)5, "tpe");
+      TPE((short)4, "tpe");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -10924,9 +9327,7 @@ public class ManagerClientService {
             return TOPE;
           case 3: // TNASE
             return TNASE;
-          case 4: // TCME
-            return TCME;
-          case 5: // TPE
+          case 4: // TPE
             return TPE;
           default:
             return null;
@@ -10980,36 +9381,32 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
       tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
-      tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class)));
       tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_result.class, metaDataMap);
     }
 
-    public modifyTableProperties_result() {
+    public setTableProperty_result() {
     }
 
-    public modifyTableProperties_result(
+    public setTableProperty_result(
       org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
       org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
       org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme,
       ThriftPropertyException tpe)
     {
       this();
       this.sec = sec;
       this.tope = tope;
       this.tnase = tnase;
-      this.tcme = tcme;
       this.tpe = tpe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public modifyTableProperties_result(modifyTableProperties_result other) {
+    public setTableProperty_result(setTableProperty_result other) {
       if (other.isSetSec()) {
         this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
       }
@@ -11019,17 +9416,14 @@ public class ManagerClientService {
       if (other.isSetTnase()) {
         this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
       }
-      if (other.isSetTcme()) {
-        this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme);
-      }
       if (other.isSetTpe()) {
         this.tpe = new ThriftPropertyException(other.tpe);
       }
     }
 
     @Override
-    public modifyTableProperties_result deepCopy() {
-      return new modifyTableProperties_result(this);
+    public setTableProperty_result deepCopy() {
+      return new setTableProperty_result(this);
     }
 
     @Override
@@ -11037,7 +9431,6 @@ public class ManagerClientService {
       this.sec = null;
       this.tope = null;
       this.tnase = null;
-      this.tcme = null;
       this.tpe = null;
     }
 
@@ -11046,7 +9439,7 @@ public class ManagerClientService {
       return this.sec;
     }
 
-    public modifyTableProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+    public setTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
       this.sec = sec;
       return this;
     }
@@ -11071,7 +9464,7 @@ public class ManagerClientService {
       return this.tope;
     }
 
-    public modifyTableProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
+    public setTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
       this.tope = tope;
       return this;
     }
@@ -11096,7 +9489,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public modifyTableProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public setTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -11116,37 +9509,12 @@ public class ManagerClientService {
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() {
-      return this.tcme;
-    }
-
-    public modifyTableProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) {
-      this.tcme = tcme;
-      return this;
-    }
-
-    public void unsetTcme() {
-      this.tcme = null;
-    }
-
-    /** Returns true if field tcme is set (has been assigned a value) and false otherwise */
-    public boolean isSetTcme() {
-      return this.tcme != null;
-    }
-
-    public void setTcmeIsSet(boolean value) {
-      if (!value) {
-        this.tcme = null;
-      }
-    }
-
     @org.apache.thrift.annotation.Nullable
     public ThriftPropertyException getTpe() {
       return this.tpe;
     }
 
-    public modifyTableProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
+    public setTableProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
       this.tpe = tpe;
       return this;
     }
@@ -11193,14 +9561,6 @@ public class ManagerClientService {
         }
         break;
 
-      case TCME:
-        if (value == null) {
-          unsetTcme();
-        } else {
-          setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value);
-        }
-        break;
-
       case TPE:
         if (value == null) {
           unsetTpe();
@@ -11225,9 +9585,6 @@ public class ManagerClientService {
       case TNASE:
         return getTnase();
 
-      case TCME:
-        return getTcme();
-
       case TPE:
         return getTpe();
 
@@ -11249,8 +9606,6 @@ public class ManagerClientService {
         return isSetTope();
       case TNASE:
         return isSetTnase();
-      case TCME:
-        return isSetTcme();
       case TPE:
         return isSetTpe();
       }
@@ -11259,12 +9614,12 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof modifyTableProperties_result)
-        return this.equals((modifyTableProperties_result)that);
+      if (that instanceof setTableProperty_result)
+        return this.equals((setTableProperty_result)that);
       return false;
     }
 
-    public boolean equals(modifyTableProperties_result that) {
+    public boolean equals(setTableProperty_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -11297,15 +9652,6 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_tcme = true && this.isSetTcme();
-      boolean that_present_tcme = true && that.isSetTcme();
-      if (this_present_tcme || that_present_tcme) {
-        if (!(this_present_tcme && that_present_tcme))
-          return false;
-        if (!this.tcme.equals(that.tcme))
-          return false;
-      }
-
       boolean this_present_tpe = true && this.isSetTpe();
       boolean that_present_tpe = true && that.isSetTpe();
       if (this_present_tpe || that_present_tpe) {
@@ -11334,10 +9680,6 @@ public class ManagerClientService {
       if (isSetTnase())
         hashCode = hashCode * 8191 + tnase.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287);
-      if (isSetTcme())
-        hashCode = hashCode * 8191 + tcme.hashCode();
-
       hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
       if (isSetTpe())
         hashCode = hashCode * 8191 + tpe.hashCode();
@@ -11346,7 +9688,7 @@ public class ManagerClientService {
     }
 
     @Override
-    public int compareTo(modifyTableProperties_result other) {
+    public int compareTo(setTableProperty_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -11383,16 +9725,6 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTcme()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe());
       if (lastComparison != 0) {
         return lastComparison;
@@ -11423,7 +9755,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_result(");
       boolean first = true;
 
       sb.append("sec:");
@@ -11450,14 +9782,6 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("tcme:");
-      if (this.tcme == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tcme);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("tpe:");
       if (this.tpe == null) {
         sb.append("null");
@@ -11490,17 +9814,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class modifyTableProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyTableProperties_resultStandardScheme getScheme() {
-        return new modifyTableProperties_resultStandardScheme();
+      public setTableProperty_resultStandardScheme getScheme() {
+        return new setTableProperty_resultStandardScheme();
       }
     }
 
-    private static class modifyTableProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyTableProperties_result> {
+    private static class setTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setTableProperty_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -11537,16 +9861,7 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // TCME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
-                struct.tcme.read(iprot);
-                struct.setTcmeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // TPE
+            case 4: // TPE
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
                 struct.tpe = new ThriftPropertyException();
                 struct.tpe.read(iprot);
@@ -11567,7 +9882,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -11586,11 +9901,6 @@ public class ManagerClientService {
           struct.tnase.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.tcme != null) {
-          oprot.writeFieldBegin(TCME_FIELD_DESC);
-          struct.tcme.write(oprot);
-          oprot.writeFieldEnd();
-        }
         if (struct.tpe != null) {
           oprot.writeFieldBegin(TPE_FIELD_DESC);
           struct.tpe.write(oprot);
@@ -11602,17 +9912,17 @@ public class ManagerClientService {
 
     }
 
-    private static class modifyTableProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyTableProperties_resultTupleScheme getScheme() {
-        return new modifyTableProperties_resultTupleScheme();
+      public setTableProperty_resultTupleScheme getScheme() {
+        return new setTableProperty_resultTupleScheme();
       }
     }
 
-    private static class modifyTableProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyTableProperties_result> {
+    private static class setTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setTableProperty_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSec()) {
@@ -11624,13 +9934,10 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           optionals.set(2);
         }
-        if (struct.isSetTcme()) {
-          optionals.set(3);
-        }
         if (struct.isSetTpe()) {
-          optionals.set(4);
+          optionals.set(3);
         }
-        oprot.writeBitSet(optionals, 5);
+        oprot.writeBitSet(optionals, 4);
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -11640,18 +9947,15 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           struct.tnase.write(oprot);
         }
-        if (struct.isSetTcme()) {
-          struct.tcme.write(oprot);
-        }
         if (struct.isSetTpe()) {
           struct.tpe.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(5);
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
           struct.sec.read(iprot);
@@ -11668,11 +9972,6 @@ public class ManagerClientService {
           struct.setTnaseIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
-          struct.tcme.read(iprot);
-          struct.setTcmeIsSet(true);
-        }
-        if (incoming.get(4)) {
           struct.tpe = new ThriftPropertyException();
           struct.tpe.read(iprot);
           struct.setTpeIsSet(true);
@@ -11686,28 +9985,28 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class removeTableProperty_args implements org.apache.thrift.TBase<removeTableProperty_args, removeTableProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<removeTableProperty_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_args");
+  public static class modifyTableProperties_args implements org.apache.thrift.TBase<modifyTableProperties_args, modifyTableProperties_args._Fields>, java.io.Serializable, Cloneable, Comparable<modifyTableProperties_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4);
+    private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_argsTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
     public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String property; // required
+    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
       CREDENTIALS((short)2, "credentials"),
       TABLE_NAME((short)3, "tableName"),
-      PROPERTY((short)4, "property");
+      V_PROPERTIES((short)4, "vProperties");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -11729,8 +10028,8 @@ public class ManagerClientService {
             return CREDENTIALS;
           case 3: // TABLE_NAME
             return TABLE_NAME;
-          case 4: // PROPERTY
-            return PROPERTY;
+          case 4: // V_PROPERTIES
+            return V_PROPERTIES;
           default:
             return null;
         }
@@ -11783,32 +10082,32 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
       tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_args.class, metaDataMap);
     }
 
-    public removeTableProperty_args() {
+    public modifyTableProperties_args() {
     }
 
-    public removeTableProperty_args(
+    public modifyTableProperties_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
       java.lang.String tableName,
-      java.lang.String property)
+      org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties)
     {
       this();
       this.tinfo = tinfo;
       this.credentials = credentials;
       this.tableName = tableName;
-      this.property = property;
+      this.vProperties = vProperties;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public removeTableProperty_args(removeTableProperty_args other) {
+    public modifyTableProperties_args(modifyTableProperties_args other) {
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
       }
@@ -11818,14 +10117,14 @@ public class ManagerClientService {
       if (other.isSetTableName()) {
         this.tableName = other.tableName;
       }
-      if (other.isSetProperty()) {
-        this.property = other.property;
+      if (other.isSetVProperties()) {
+        this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties);
       }
     }
 
     @Override
-    public removeTableProperty_args deepCopy() {
-      return new removeTableProperty_args(this);
+    public modifyTableProperties_args deepCopy() {
+      return new modifyTableProperties_args(this);
     }
 
     @Override
@@ -11833,7 +10132,7 @@ public class ManagerClientService {
       this.tinfo = null;
       this.credentials = null;
       this.tableName = null;
-      this.property = null;
+      this.vProperties = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -11841,7 +10140,7 @@ public class ManagerClientService {
       return this.tinfo;
     }
 
-    public removeTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
+    public modifyTableProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
       this.tinfo = tinfo;
       return this;
     }
@@ -11866,7 +10165,7 @@ public class ManagerClientService {
       return this.credentials;
     }
 
-    public removeTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+    public modifyTableProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -11891,7 +10190,7 @@ public class ManagerClientService {
       return this.tableName;
     }
 
-    public removeTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
+    public modifyTableProperties_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
       this.tableName = tableName;
       return this;
     }
@@ -11912,27 +10211,27 @@ public class ManagerClientService {
     }
 
     @org.apache.thrift.annotation.Nullable
-    public java.lang.String getProperty() {
-      return this.property;
+    public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() {
+      return this.vProperties;
     }
 
-    public removeTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
-      this.property = property;
+    public modifyTableProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) {
+      this.vProperties = vProperties;
       return this;
     }
 
-    public void unsetProperty() {
-      this.property = null;
+    public void unsetVProperties() {
+      this.vProperties = null;
     }
 
-    /** Returns true if field property is set (has been assigned a value) and false otherwise */
-    public boolean isSetProperty() {
-      return this.property != null;
+    /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */
+    public boolean isSetVProperties() {
+      return this.vProperties != null;
     }
 
-    public void setPropertyIsSet(boolean value) {
+    public void setVPropertiesIsSet(boolean value) {
       if (!value) {
-        this.property = null;
+        this.vProperties = null;
       }
     }
 
@@ -11963,11 +10262,11 @@ public class ManagerClientService {
         }
         break;
 
-      case PROPERTY:
+      case V_PROPERTIES:
         if (value == null) {
-          unsetProperty();
+          unsetVProperties();
         } else {
-          setProperty((java.lang.String)value);
+          setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value);
         }
         break;
 
@@ -11987,8 +10286,8 @@ public class ManagerClientService {
       case TABLE_NAME:
         return getTableName();
 
-      case PROPERTY:
-        return getProperty();
+      case V_PROPERTIES:
+        return getVProperties();
 
       }
       throw new java.lang.IllegalStateException();
@@ -12008,20 +10307,20 @@ public class ManagerClientService {
         return isSetCredentials();
       case TABLE_NAME:
         return isSetTableName();
-      case PROPERTY:
-        return isSetProperty();
+      case V_PROPERTIES:
+        return isSetVProperties();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof removeTableProperty_args)
-        return this.equals((removeTableProperty_args)that);
+      if (that instanceof modifyTableProperties_args)
+        return this.equals((modifyTableProperties_args)that);
       return false;
     }
 
-    public boolean equals(removeTableProperty_args that) {
+    public boolean equals(modifyTableProperties_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -12054,12 +10353,12 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_property = true && this.isSetProperty();
-      boolean that_present_property = true && that.isSetProperty();
-      if (this_present_property || that_present_property) {
-        if (!(this_present_property && that_present_property))
+      boolean this_present_vProperties = true && this.isSetVProperties();
+      boolean that_present_vProperties = true && that.isSetVProperties();
+      if (this_present_vProperties || that_present_vProperties) {
+        if (!(this_present_vProperties && that_present_vProperties))
           return false;
-        if (!this.property.equals(that.property))
+        if (!this.vProperties.equals(that.vProperties))
           return false;
       }
 
@@ -12082,15 +10381,15 @@ public class ManagerClientService {
       if (isSetTableName())
         hashCode = hashCode * 8191 + tableName.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287);
-      if (isSetProperty())
-        hashCode = hashCode * 8191 + property.hashCode();
+      hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287);
+      if (isSetVProperties())
+        hashCode = hashCode * 8191 + vProperties.hashCode();
 
       return hashCode;
     }
 
     @Override
-    public int compareTo(removeTableProperty_args other) {
+    public int compareTo(modifyTableProperties_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -12127,12 +10426,12 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetProperty()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property);
+      if (isSetVProperties()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -12158,7 +10457,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_args(");
       boolean first = true;
 
       sb.append("tinfo:");
@@ -12185,11 +10484,11 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("property:");
-      if (this.property == null) {
+      sb.append("vProperties:");
+      if (this.vProperties == null) {
         sb.append("null");
       } else {
-        sb.append(this.property);
+        sb.append(this.vProperties);
       }
       first = false;
       sb.append(")");
@@ -12205,6 +10504,9 @@ public class ManagerClientService {
       if (credentials != null) {
         credentials.validate();
       }
+      if (vProperties != null) {
+        vProperties.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -12223,17 +10525,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class removeTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyTableProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeTableProperty_argsStandardScheme getScheme() {
-        return new removeTableProperty_argsStandardScheme();
+      public modifyTableProperties_argsStandardScheme getScheme() {
+        return new modifyTableProperties_argsStandardScheme();
       }
     }
 
-    private static class removeTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<removeTableProperty_args> {
+    private static class modifyTableProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyTableProperties_args> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -12269,10 +10571,11 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // PROPERTY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.property = iprot.readString();
-                struct.setPropertyIsSet(true);
+            case 4: // V_PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
+                struct.vProperties.read(iprot);
+                struct.setVPropertiesIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -12289,7 +10592,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -12308,9 +10611,9 @@ public class ManagerClientService {
           oprot.writeString(struct.tableName);
           oprot.writeFieldEnd();
         }
-        if (struct.property != null) {
-          oprot.writeFieldBegin(PROPERTY_FIELD_DESC);
-          oprot.writeString(struct.property);
+        if (struct.vProperties != null) {
+          oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC);
+          struct.vProperties.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -12319,17 +10622,17 @@ public class ManagerClientService {
 
     }
 
-    private static class removeTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyTableProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeTableProperty_argsTupleScheme getScheme() {
-        return new removeTableProperty_argsTupleScheme();
+      public modifyTableProperties_argsTupleScheme getScheme() {
+        return new modifyTableProperties_argsTupleScheme();
       }
     }
 
-    private static class removeTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<removeTableProperty_args> {
+    private static class modifyTableProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyTableProperties_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetTinfo()) {
@@ -12341,7 +10644,7 @@ public class ManagerClientService {
         if (struct.isSetTableName()) {
           optionals.set(2);
         }
-        if (struct.isSetProperty()) {
+        if (struct.isSetVProperties()) {
           optionals.set(3);
         }
         oprot.writeBitSet(optionals, 4);
@@ -12354,13 +10657,13 @@ public class ManagerClientService {
         if (struct.isSetTableName()) {
           oprot.writeString(struct.tableName);
         }
-        if (struct.isSetProperty()) {
-          oprot.writeString(struct.property);
+        if (struct.isSetVProperties()) {
+          struct.vProperties.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
@@ -12378,8 +10681,9 @@ public class ManagerClientService {
           struct.setTableNameIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.property = iprot.readString();
-          struct.setPropertyIsSet(true);
+          struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
+          struct.vProperties.read(iprot);
+          struct.setVPropertiesIsSet(true);
         }
       }
     }
@@ -12390,25 +10694,31 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class removeTableProperty_result implements org.apache.thrift.TBase<removeTableProperty_result, removeTableProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<removeTableProperty_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_result");
+  public static class modifyTableProperties_result implements org.apache.thrift.TBase<modifyTableProperties_result, modifyTableProperties_result._Fields>, java.io.Serializable, Cloneable, Comparable<modifyTableProperties_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_result");
 
     private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+    private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_resultTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
+    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required
+    public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SEC((short)1, "sec"),
       TOPE((short)2, "tope"),
-      TNASE((short)3, "tnase");
+      TNASE((short)3, "tnase"),
+      TCME((short)4, "tcme"),
+      TPE((short)5, "tpe");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -12430,6 +10740,10 @@ public class ManagerClientService {
             return TOPE;
           case 3: // TNASE
             return TNASE;
+          case 4: // TCME
+            return TCME;
+          case 5: // TPE
+            return TPE;
           default:
             return null;
         }
@@ -12482,28 +10796,36 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
       tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
+      tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class)));
+      tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_result.class, metaDataMap);
     }
 
-    public removeTableProperty_result() {
+    public modifyTableProperties_result() {
     }
 
-    public removeTableProperty_result(
+    public modifyTableProperties_result(
       org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
       org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
+      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase,
+      org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme,
+      ThriftPropertyException tpe)
     {
       this();
       this.sec = sec;
       this.tope = tope;
       this.tnase = tnase;
+      this.tcme = tcme;
+      this.tpe = tpe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public removeTableProperty_result(removeTableProperty_result other) {
+    public modifyTableProperties_result(modifyTableProperties_result other) {
       if (other.isSetSec()) {
         this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
       }
@@ -12513,11 +10835,17 @@ public class ManagerClientService {
       if (other.isSetTnase()) {
         this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
       }
+      if (other.isSetTcme()) {
+        this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme);
+      }
+      if (other.isSetTpe()) {
+        this.tpe = new ThriftPropertyException(other.tpe);
+      }
     }
 
     @Override
-    public removeTableProperty_result deepCopy() {
-      return new removeTableProperty_result(this);
+    public modifyTableProperties_result deepCopy() {
+      return new modifyTableProperties_result(this);
     }
 
     @Override
@@ -12525,6 +10853,8 @@ public class ManagerClientService {
       this.sec = null;
       this.tope = null;
       this.tnase = null;
+      this.tcme = null;
+      this.tpe = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -12532,7 +10862,7 @@ public class ManagerClientService {
       return this.sec;
     }
 
-    public removeTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+    public modifyTableProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
       this.sec = sec;
       return this;
     }
@@ -12557,7 +10887,7 @@ public class ManagerClientService {
       return this.tope;
     }
 
-    public removeTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
+    public modifyTableProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
       this.tope = tope;
       return this;
     }
@@ -12582,7 +10912,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public removeTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public modifyTableProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -12602,6 +10932,56 @@ public class ManagerClientService {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
+    public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() {
+      return this.tcme;
+    }
+
+    public modifyTableProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) {
+      this.tcme = tcme;
+      return this;
+    }
+
+    public void unsetTcme() {
+      this.tcme = null;
+    }
+
+    /** Returns true if field tcme is set (has been assigned a value) and false otherwise */
+    public boolean isSetTcme() {
+      return this.tcme != null;
+    }
+
+    public void setTcmeIsSet(boolean value) {
+      if (!value) {
+        this.tcme = null;
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public ThriftPropertyException getTpe() {
+      return this.tpe;
+    }
+
+    public modifyTableProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
+      this.tpe = tpe;
+      return this;
+    }
+
+    public void unsetTpe() {
+      this.tpe = null;
+    }
+
+    /** Returns true if field tpe is set (has been assigned a value) and false otherwise */
+    public boolean isSetTpe() {
+      return this.tpe != null;
+    }
+
+    public void setTpeIsSet(boolean value) {
+      if (!value) {
+        this.tpe = null;
+      }
+    }
+
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
@@ -12629,6 +11009,22 @@ public class ManagerClientService {
         }
         break;
 
+      case TCME:
+        if (value == null) {
+          unsetTcme();
+        } else {
+          setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value);
+        }
+        break;
+
+      case TPE:
+        if (value == null) {
+          unsetTpe();
+        } else {
+          setTpe((ThriftPropertyException)value);
+        }
+        break;
+
       }
     }
 
@@ -12645,6 +11041,12 @@ public class ManagerClientService {
       case TNASE:
         return getTnase();
 
+      case TCME:
+        return getTcme();
+
+      case TPE:
+        return getTpe();
+
       }
       throw new java.lang.IllegalStateException();
     }
@@ -12663,18 +11065,22 @@ public class ManagerClientService {
         return isSetTope();
       case TNASE:
         return isSetTnase();
+      case TCME:
+        return isSetTcme();
+      case TPE:
+        return isSetTpe();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof removeTableProperty_result)
-        return this.equals((removeTableProperty_result)that);
+      if (that instanceof modifyTableProperties_result)
+        return this.equals((modifyTableProperties_result)that);
       return false;
     }
 
-    public boolean equals(removeTableProperty_result that) {
+    public boolean equals(modifyTableProperties_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -12707,6 +11113,24 @@ public class ManagerClientService {
           return false;
       }
 
+      boolean this_present_tcme = true && this.isSetTcme();
+      boolean that_present_tcme = true && that.isSetTcme();
+      if (this_present_tcme || that_present_tcme) {
+        if (!(this_present_tcme && that_present_tcme))
+          return false;
+        if (!this.tcme.equals(that.tcme))
+          return false;
+      }
+
+      boolean this_present_tpe = true && this.isSetTpe();
+      boolean that_present_tpe = true && that.isSetTpe();
+      if (this_present_tpe || that_present_tpe) {
+        if (!(this_present_tpe && that_present_tpe))
+          return false;
+        if (!this.tpe.equals(that.tpe))
+          return false;
+      }
+
       return true;
     }
 
@@ -12726,11 +11150,19 @@ public class ManagerClientService {
       if (isSetTnase())
         hashCode = hashCode * 8191 + tnase.hashCode();
 
+      hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287);
+      if (isSetTcme())
+        hashCode = hashCode * 8191 + tcme.hashCode();
+
+      hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+      if (isSetTpe())
+        hashCode = hashCode * 8191 + tpe.hashCode();
+
       return hashCode;
     }
 
     @Override
-    public int compareTo(removeTableProperty_result other) {
+    public int compareTo(modifyTableProperties_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -12767,6 +11199,26 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
+      lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTcme()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTpe()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -12787,7 +11239,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_result(");
       boolean first = true;
 
       sb.append("sec:");
@@ -12813,6 +11265,22 @@ public class ManagerClientService {
         sb.append(this.tnase);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("tcme:");
+      if (this.tcme == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.tcme);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("tpe:");
+      if (this.tpe == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.tpe);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -12838,17 +11306,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class removeTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyTableProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeTableProperty_resultStandardScheme getScheme() {
-        return new removeTableProperty_resultStandardScheme();
+      public modifyTableProperties_resultStandardScheme getScheme() {
+        return new modifyTableProperties_resultStandardScheme();
       }
     }
 
-    private static class removeTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<removeTableProperty_result> {
+    private static class modifyTableProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyTableProperties_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -12885,6 +11353,24 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
+            case 4: // TCME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
+                struct.tcme.read(iprot);
+                struct.setTcmeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // TPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.tpe = new ThriftPropertyException();
+                struct.tpe.read(iprot);
+                struct.setTpeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -12897,7 +11383,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -12916,23 +11402,33 @@ public class ManagerClientService {
           struct.tnase.write(oprot);
           oprot.writeFieldEnd();
         }
+        if (struct.tcme != null) {
+          oprot.writeFieldBegin(TCME_FIELD_DESC);
+          struct.tcme.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.tpe != null) {
+          oprot.writeFieldBegin(TPE_FIELD_DESC);
+          struct.tpe.write(oprot);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class removeTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyTableProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeTableProperty_resultTupleScheme getScheme() {
-        return new removeTableProperty_resultTupleScheme();
+      public modifyTableProperties_resultTupleScheme getScheme() {
+        return new modifyTableProperties_resultTupleScheme();
       }
     }
 
-    private static class removeTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<removeTableProperty_result> {
+    private static class modifyTableProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyTableProperties_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSec()) {
@@ -12944,7 +11440,13 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           optionals.set(2);
         }
-        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetTcme()) {
+          optionals.set(3);
+        }
+        if (struct.isSetTpe()) {
+          optionals.set(4);
+        }
+        oprot.writeBitSet(optionals, 5);
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -12954,12 +11456,18 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           struct.tnase.write(oprot);
         }
+        if (struct.isSetTcme()) {
+          struct.tcme.write(oprot);
+        }
+        if (struct.isSetTpe()) {
+          struct.tpe.write(oprot);
+        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
           struct.sec.read(iprot);
@@ -12975,6 +11483,16 @@ public class ManagerClientService {
           struct.tnase.read(iprot);
           struct.setTnaseIsSet(true);
         }
+        if (incoming.get(3)) {
+          struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
+          struct.tcme.read(iprot);
+          struct.setTcmeIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.tpe = new ThriftPropertyException();
+          struct.tpe.read(iprot);
+          struct.setTpeIsSet(true);
+        }
       }
     }
 
@@ -12984,31 +11502,28 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class setNamespaceProperty_args implements org.apache.thrift.TBase<setNamespaceProperty_args, setNamespaceProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<setNamespaceProperty_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_args");
+  public static class removeTableProperty_args implements org.apache.thrift.TBase<removeTableProperty_args, removeTableProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<removeTableProperty_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3);
+    private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3);
     private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4);
-    private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_argsTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required
     public @org.apache.thrift.annotation.Nullable java.lang.String property; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String value; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
       CREDENTIALS((short)2, "credentials"),
-      NS((short)3, "ns"),
-      PROPERTY((short)4, "property"),
-      VALUE((short)5, "value");
+      TABLE_NAME((short)3, "tableName"),
+      PROPERTY((short)4, "property");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -13028,12 +11543,10 @@ public class ManagerClientService {
             return TINFO;
           case 2: // CREDENTIALS
             return CREDENTIALS;
-          case 3: // NS
-            return NS;
+          case 3: // TABLE_NAME
+            return TABLE_NAME;
           case 4: // PROPERTY
             return PROPERTY;
-          case 5: // VALUE
-            return VALUE;
           default:
             return null;
         }
@@ -13084,67 +11597,59 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class)));
       tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
-      tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+      tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_args.class, metaDataMap);
     }
 
-    public setNamespaceProperty_args() {
+    public removeTableProperty_args() {
     }
 
-    public setNamespaceProperty_args(
+    public removeTableProperty_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
-      java.lang.String ns,
-      java.lang.String property,
-      java.lang.String value)
+      java.lang.String tableName,
+      java.lang.String property)
     {
       this();
       this.tinfo = tinfo;
       this.credentials = credentials;
-      this.ns = ns;
+      this.tableName = tableName;
       this.property = property;
-      this.value = value;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setNamespaceProperty_args(setNamespaceProperty_args other) {
+    public removeTableProperty_args(removeTableProperty_args other) {
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
       }
       if (other.isSetCredentials()) {
         this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials);
       }
-      if (other.isSetNs()) {
-        this.ns = other.ns;
+      if (other.isSetTableName()) {
+        this.tableName = other.tableName;
       }
       if (other.isSetProperty()) {
         this.property = other.property;
       }
-      if (other.isSetValue()) {
-        this.value = other.value;
-      }
     }
 
     @Override
-    public setNamespaceProperty_args deepCopy() {
-      return new setNamespaceProperty_args(this);
+    public removeTableProperty_args deepCopy() {
+      return new removeTableProperty_args(this);
     }
 
     @Override
     public void clear() {
       this.tinfo = null;
       this.credentials = null;
-      this.ns = null;
+      this.tableName = null;
       this.property = null;
-      this.value = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -13152,7 +11657,7 @@ public class ManagerClientService {
       return this.tinfo;
     }
 
-    public setNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
+    public removeTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
       this.tinfo = tinfo;
       return this;
     }
@@ -13177,7 +11682,7 @@ public class ManagerClientService {
       return this.credentials;
     }
 
-    public setNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+    public removeTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -13198,27 +11703,27 @@ public class ManagerClientService {
     }
 
     @org.apache.thrift.annotation.Nullable
-    public java.lang.String getNs() {
-      return this.ns;
+    public java.lang.String getTableName() {
+      return this.tableName;
     }
 
-    public setNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) {
-      this.ns = ns;
+    public removeTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) {
+      this.tableName = tableName;
       return this;
     }
 
-    public void unsetNs() {
-      this.ns = null;
+    public void unsetTableName() {
+      this.tableName = null;
     }
 
-    /** Returns true if field ns is set (has been assigned a value) and false otherwise */
-    public boolean isSetNs() {
-      return this.ns != null;
+    /** Returns true if field tableName is set (has been assigned a value) and false otherwise */
+    public boolean isSetTableName() {
+      return this.tableName != null;
     }
 
-    public void setNsIsSet(boolean value) {
+    public void setTableNameIsSet(boolean value) {
       if (!value) {
-        this.ns = null;
+        this.tableName = null;
       }
     }
 
@@ -13227,7 +11732,7 @@ public class ManagerClientService {
       return this.property;
     }
 
-    public setNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
+    public removeTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
       this.property = property;
       return this;
     }
@@ -13247,31 +11752,6 @@ public class ManagerClientService {
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public java.lang.String getValue() {
-      return this.value;
-    }
-
-    public setNamespaceProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) {
-      this.value = value;
-      return this;
-    }
-
-    public void unsetValue() {
-      this.value = null;
-    }
-
-    /** Returns true if field value is set (has been assigned a value) and false otherwise */
-    public boolean isSetValue() {
-      return this.value != null;
-    }
-
-    public void setValueIsSet(boolean value) {
-      if (!value) {
-        this.value = null;
-      }
-    }
-
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
@@ -13291,11 +11771,11 @@ public class ManagerClientService {
         }
         break;
 
-      case NS:
+      case TABLE_NAME:
         if (value == null) {
-          unsetNs();
+          unsetTableName();
         } else {
-          setNs((java.lang.String)value);
+          setTableName((java.lang.String)value);
         }
         break;
 
@@ -13307,14 +11787,6 @@ public class ManagerClientService {
         }
         break;
 
-      case VALUE:
-        if (value == null) {
-          unsetValue();
-        } else {
-          setValue((java.lang.String)value);
-        }
-        break;
-
       }
     }
 
@@ -13328,15 +11800,12 @@ public class ManagerClientService {
       case CREDENTIALS:
         return getCredentials();
 
-      case NS:
-        return getNs();
+      case TABLE_NAME:
+        return getTableName();
 
       case PROPERTY:
         return getProperty();
 
-      case VALUE:
-        return getValue();
-
       }
       throw new java.lang.IllegalStateException();
     }
@@ -13353,24 +11822,22 @@ public class ManagerClientService {
         return isSetTinfo();
       case CREDENTIALS:
         return isSetCredentials();
-      case NS:
-        return isSetNs();
+      case TABLE_NAME:
+        return isSetTableName();
       case PROPERTY:
         return isSetProperty();
-      case VALUE:
-        return isSetValue();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof setNamespaceProperty_args)
-        return this.equals((setNamespaceProperty_args)that);
+      if (that instanceof removeTableProperty_args)
+        return this.equals((removeTableProperty_args)that);
       return false;
     }
 
-    public boolean equals(setNamespaceProperty_args that) {
+    public boolean equals(removeTableProperty_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -13394,12 +11861,12 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_ns = true && this.isSetNs();
-      boolean that_present_ns = true && that.isSetNs();
-      if (this_present_ns || that_present_ns) {
-        if (!(this_present_ns && that_present_ns))
+      boolean this_present_tableName = true && this.isSetTableName();
+      boolean that_present_tableName = true && that.isSetTableName();
+      if (this_present_tableName || that_present_tableName) {
+        if (!(this_present_tableName && that_present_tableName))
           return false;
-        if (!this.ns.equals(that.ns))
+        if (!this.tableName.equals(that.tableName))
           return false;
       }
 
@@ -13412,15 +11879,6 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_value = true && this.isSetValue();
-      boolean that_present_value = true && that.isSetValue();
-      if (this_present_value || that_present_value) {
-        if (!(this_present_value && that_present_value))
-          return false;
-        if (!this.value.equals(that.value))
-          return false;
-      }
-
       return true;
     }
 
@@ -13436,23 +11894,19 @@ public class ManagerClientService {
       if (isSetCredentials())
         hashCode = hashCode * 8191 + credentials.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetNs()) ? 131071 : 524287);
-      if (isSetNs())
-        hashCode = hashCode * 8191 + ns.hashCode();
+      hashCode = hashCode * 8191 + ((isSetTableName()) ? 131071 : 524287);
+      if (isSetTableName())
+        hashCode = hashCode * 8191 + tableName.hashCode();
 
       hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287);
       if (isSetProperty())
         hashCode = hashCode * 8191 + property.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
-      if (isSetValue())
-        hashCode = hashCode * 8191 + value.hashCode();
-
       return hashCode;
     }
 
     @Override
-    public int compareTo(setNamespaceProperty_args other) {
+    public int compareTo(removeTableProperty_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -13479,12 +11933,12 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetNs()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ns, other.ns);
+      if (isSetTableName()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, other.tableName);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -13499,16 +11953,6 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetValue()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -13530,7 +11974,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_args(");
       boolean first = true;
 
       sb.append("tinfo:");
@@ -13549,11 +11993,11 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("ns:");
-      if (this.ns == null) {
+      sb.append("tableName:");
+      if (this.tableName == null) {
         sb.append("null");
       } else {
-        sb.append(this.ns);
+        sb.append(this.tableName);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -13564,14 +12008,6 @@ public class ManagerClientService {
         sb.append(this.property);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("value:");
-      if (this.value == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.value);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -13603,17 +12039,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class setNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class removeTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setNamespaceProperty_argsStandardScheme getScheme() {
-        return new setNamespaceProperty_argsStandardScheme();
+      public removeTableProperty_argsStandardScheme getScheme() {
+        return new removeTableProperty_argsStandardScheme();
       }
     }
 
-    private static class setNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setNamespaceProperty_args> {
+    private static class removeTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<removeTableProperty_args> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -13641,10 +12077,10 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // NS
+            case 3: // TABLE_NAME
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.ns = iprot.readString();
-                struct.setNsIsSet(true);
+                struct.tableName = iprot.readString();
+                struct.setTableNameIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -13657,14 +12093,6 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 5: // VALUE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.value = iprot.readString();
-                struct.setValueIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -13677,7 +12105,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -13691,9 +12119,9 @@ public class ManagerClientService {
           struct.credentials.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.ns != null) {
-          oprot.writeFieldBegin(NS_FIELD_DESC);
-          oprot.writeString(struct.ns);
+        if (struct.tableName != null) {
+          oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC);
+          oprot.writeString(struct.tableName);
           oprot.writeFieldEnd();
         }
         if (struct.property != null) {
@@ -13701,28 +12129,23 @@ public class ManagerClientService {
           oprot.writeString(struct.property);
           oprot.writeFieldEnd();
         }
-        if (struct.value != null) {
-          oprot.writeFieldBegin(VALUE_FIELD_DESC);
-          oprot.writeString(struct.value);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class setNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class removeTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setNamespaceProperty_argsTupleScheme getScheme() {
-        return new setNamespaceProperty_argsTupleScheme();
+      public removeTableProperty_argsTupleScheme getScheme() {
+        return new removeTableProperty_argsTupleScheme();
       }
     }
 
-    private static class setNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setNamespaceProperty_args> {
+    private static class removeTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<removeTableProperty_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetTinfo()) {
@@ -13731,37 +12154,31 @@ public class ManagerClientService {
         if (struct.isSetCredentials()) {
           optionals.set(1);
         }
-        if (struct.isSetNs()) {
+        if (struct.isSetTableName()) {
           optionals.set(2);
         }
         if (struct.isSetProperty()) {
           optionals.set(3);
         }
-        if (struct.isSetValue()) {
-          optionals.set(4);
-        }
-        oprot.writeBitSet(optionals, 5);
+        oprot.writeBitSet(optionals, 4);
         if (struct.isSetTinfo()) {
           struct.tinfo.write(oprot);
         }
         if (struct.isSetCredentials()) {
           struct.credentials.write(oprot);
         }
-        if (struct.isSetNs()) {
-          oprot.writeString(struct.ns);
+        if (struct.isSetTableName()) {
+          oprot.writeString(struct.tableName);
         }
         if (struct.isSetProperty()) {
           oprot.writeString(struct.property);
         }
-        if (struct.isSetValue()) {
-          oprot.writeString(struct.value);
-        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(5);
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo();
           struct.tinfo.read(iprot);
@@ -13773,17 +12190,13 @@ public class ManagerClientService {
           struct.setCredentialsIsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ns = iprot.readString();
-          struct.setNsIsSet(true);
+          struct.tableName = iprot.readString();
+          struct.setTableNameIsSet(true);
         }
         if (incoming.get(3)) {
           struct.property = iprot.readString();
           struct.setPropertyIsSet(true);
         }
-        if (incoming.get(4)) {
-          struct.value = iprot.readString();
-          struct.setValueIsSet(true);
-        }
       }
     }
 
@@ -13793,28 +12206,25 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class setNamespaceProperty_result implements org.apache.thrift.TBase<setNamespaceProperty_result, setNamespaceProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<setNamespaceProperty_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_result");
+  public static class removeTableProperty_result implements org.apache.thrift.TBase<removeTableProperty_result, removeTableProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<removeTableProperty_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_result");
 
     private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_resultTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
-    public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SEC((short)1, "sec"),
       TOPE((short)2, "tope"),
-      TNASE((short)3, "tnase"),
-      TPE((short)4, "tpe");
+      TNASE((short)3, "tnase");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -13836,8 +12246,6 @@ public class ManagerClientService {
             return TOPE;
           case 3: // TNASE
             return TNASE;
-          case 4: // TPE
-            return TPE;
           default:
             return null;
         }
@@ -13890,32 +12298,28 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
       tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
-      tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_result.class, metaDataMap);
     }
 
-    public setNamespaceProperty_result() {
+    public removeTableProperty_result() {
     }
 
-    public setNamespaceProperty_result(
+    public removeTableProperty_result(
       org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
       org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase,
-      ThriftPropertyException tpe)
+      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
     {
       this();
       this.sec = sec;
       this.tope = tope;
       this.tnase = tnase;
-      this.tpe = tpe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public setNamespaceProperty_result(setNamespaceProperty_result other) {
+    public removeTableProperty_result(removeTableProperty_result other) {
       if (other.isSetSec()) {
         this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
       }
@@ -13925,14 +12329,11 @@ public class ManagerClientService {
       if (other.isSetTnase()) {
         this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
       }
-      if (other.isSetTpe()) {
-        this.tpe = new ThriftPropertyException(other.tpe);
-      }
     }
 
     @Override
-    public setNamespaceProperty_result deepCopy() {
-      return new setNamespaceProperty_result(this);
+    public removeTableProperty_result deepCopy() {
+      return new removeTableProperty_result(this);
     }
 
     @Override
@@ -13940,7 +12341,6 @@ public class ManagerClientService {
       this.sec = null;
       this.tope = null;
       this.tnase = null;
-      this.tpe = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -13948,7 +12348,7 @@ public class ManagerClientService {
       return this.sec;
     }
 
-    public setNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+    public removeTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
       this.sec = sec;
       return this;
     }
@@ -13973,7 +12373,7 @@ public class ManagerClientService {
       return this.tope;
     }
 
-    public setNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
+    public removeTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
       this.tope = tope;
       return this;
     }
@@ -13998,7 +12398,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public setNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public removeTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -14018,31 +12418,6 @@ public class ManagerClientService {
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public ThriftPropertyException getTpe() {
-      return this.tpe;
-    }
-
-    public setNamespaceProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
-      this.tpe = tpe;
-      return this;
-    }
-
-    public void unsetTpe() {
-      this.tpe = null;
-    }
-
-    /** Returns true if field tpe is set (has been assigned a value) and false otherwise */
-    public boolean isSetTpe() {
-      return this.tpe != null;
-    }
-
-    public void setTpeIsSet(boolean value) {
-      if (!value) {
-        this.tpe = null;
-      }
-    }
-
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
@@ -14070,14 +12445,6 @@ public class ManagerClientService {
         }
         break;
 
-      case TPE:
-        if (value == null) {
-          unsetTpe();
-        } else {
-          setTpe((ThriftPropertyException)value);
-        }
-        break;
-
       }
     }
 
@@ -14094,9 +12461,6 @@ public class ManagerClientService {
       case TNASE:
         return getTnase();
 
-      case TPE:
-        return getTpe();
-
       }
       throw new java.lang.IllegalStateException();
     }
@@ -14115,20 +12479,18 @@ public class ManagerClientService {
         return isSetTope();
       case TNASE:
         return isSetTnase();
-      case TPE:
-        return isSetTpe();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof setNamespaceProperty_result)
-        return this.equals((setNamespaceProperty_result)that);
+      if (that instanceof removeTableProperty_result)
+        return this.equals((removeTableProperty_result)that);
       return false;
     }
 
-    public boolean equals(setNamespaceProperty_result that) {
+    public boolean equals(removeTableProperty_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -14161,15 +12523,6 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_tpe = true && this.isSetTpe();
-      boolean that_present_tpe = true && that.isSetTpe();
-      if (this_present_tpe || that_present_tpe) {
-        if (!(this_present_tpe && that_present_tpe))
-          return false;
-        if (!this.tpe.equals(that.tpe))
-          return false;
-      }
-
       return true;
     }
 
@@ -14189,15 +12542,11 @@ public class ManagerClientService {
       if (isSetTnase())
         hashCode = hashCode * 8191 + tnase.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
-      if (isSetTpe())
-        hashCode = hashCode * 8191 + tpe.hashCode();
-
       return hashCode;
     }
 
     @Override
-    public int compareTo(setNamespaceProperty_result other) {
+    public int compareTo(removeTableProperty_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -14234,16 +12583,6 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTpe()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -14264,7 +12603,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_result(");
       boolean first = true;
 
       sb.append("sec:");
@@ -14290,14 +12629,6 @@ public class ManagerClientService {
         sb.append(this.tnase);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("tpe:");
-      if (this.tpe == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tpe);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -14323,17 +12654,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class setNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class removeTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setNamespaceProperty_resultStandardScheme getScheme() {
-        return new setNamespaceProperty_resultStandardScheme();
+      public removeTableProperty_resultStandardScheme getScheme() {
+        return new removeTableProperty_resultStandardScheme();
       }
     }
 
-    private static class setNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setNamespaceProperty_result> {
+    private static class removeTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<removeTableProperty_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -14370,15 +12701,6 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // TPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tpe = new ThriftPropertyException();
-                struct.tpe.read(iprot);
-                struct.setTpeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -14391,7 +12713,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -14410,28 +12732,23 @@ public class ManagerClientService {
           struct.tnase.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.tpe != null) {
-          oprot.writeFieldBegin(TPE_FIELD_DESC);
-          struct.tpe.write(oprot);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class setNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class removeTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public setNamespaceProperty_resultTupleScheme getScheme() {
-        return new setNamespaceProperty_resultTupleScheme();
+      public removeTableProperty_resultTupleScheme getScheme() {
+        return new removeTableProperty_resultTupleScheme();
       }
     }
 
-    private static class setNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setNamespaceProperty_result> {
+    private static class removeTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<removeTableProperty_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSec()) {
@@ -14443,10 +12760,7 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           optionals.set(2);
         }
-        if (struct.isSetTpe()) {
-          optionals.set(3);
-        }
-        oprot.writeBitSet(optionals, 4);
+        oprot.writeBitSet(optionals, 3);
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -14456,15 +12770,12 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           struct.tnase.write(oprot);
         }
-        if (struct.isSetTpe()) {
-          struct.tpe.write(oprot);
-        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
           struct.sec.read(iprot);
@@ -14480,11 +12791,6 @@ public class ManagerClientService {
           struct.tnase.read(iprot);
           struct.setTnaseIsSet(true);
         }
-        if (incoming.get(3)) {
-          struct.tpe = new ThriftPropertyException();
-          struct.tpe.read(iprot);
-          struct.setTpeIsSet(true);
-        }
       }
     }
 
@@ -14494,28 +12800,31 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class modifyNamespaceProperties_args implements org.apache.thrift.TBase<modifyNamespaceProperties_args, modifyNamespaceProperties_args._Fields>, java.io.Serializable, Cloneable, Comparable<modifyNamespaceProperties_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_args");
+  public static class setNamespaceProperty_args implements org.apache.thrift.TBase<setNamespaceProperty_args, setNamespaceProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<setNamespaceProperty_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4);
+    private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_argsTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
     public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String property; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String value; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
       CREDENTIALS((short)2, "credentials"),
       NS((short)3, "ns"),
-      V_PROPERTIES((short)4, "vProperties");
+      PROPERTY((short)4, "property"),
+      VALUE((short)5, "value");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -14537,8 +12846,10 @@ public class ManagerClientService {
             return CREDENTIALS;
           case 3: // NS
             return NS;
-          case 4: // V_PROPERTIES
-            return V_PROPERTIES;
+          case 4: // PROPERTY
+            return PROPERTY;
+          case 5: // VALUE
+            return VALUE;
           default:
             return null;
         }
@@ -14591,32 +12902,36 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
       tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class)));
+      tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_args.class, metaDataMap);
     }
 
-    public modifyNamespaceProperties_args() {
+    public setNamespaceProperty_args() {
     }
 
-    public modifyNamespaceProperties_args(
+    public setNamespaceProperty_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
       java.lang.String ns,
-      org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties)
+      java.lang.String property,
+      java.lang.String value)
     {
       this();
       this.tinfo = tinfo;
       this.credentials = credentials;
       this.ns = ns;
-      this.vProperties = vProperties;
+      this.property = property;
+      this.value = value;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public modifyNamespaceProperties_args(modifyNamespaceProperties_args other) {
+    public setNamespaceProperty_args(setNamespaceProperty_args other) {
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
       }
@@ -14626,14 +12941,17 @@ public class ManagerClientService {
       if (other.isSetNs()) {
         this.ns = other.ns;
       }
-      if (other.isSetVProperties()) {
-        this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties);
+      if (other.isSetProperty()) {
+        this.property = other.property;
+      }
+      if (other.isSetValue()) {
+        this.value = other.value;
       }
     }
 
     @Override
-    public modifyNamespaceProperties_args deepCopy() {
-      return new modifyNamespaceProperties_args(this);
+    public setNamespaceProperty_args deepCopy() {
+      return new setNamespaceProperty_args(this);
     }
 
     @Override
@@ -14641,7 +12959,8 @@ public class ManagerClientService {
       this.tinfo = null;
       this.credentials = null;
       this.ns = null;
-      this.vProperties = null;
+      this.property = null;
+      this.value = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -14649,7 +12968,7 @@ public class ManagerClientService {
       return this.tinfo;
     }
 
-    public modifyNamespaceProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
+    public setNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
       this.tinfo = tinfo;
       return this;
     }
@@ -14674,7 +12993,7 @@ public class ManagerClientService {
       return this.credentials;
     }
 
-    public modifyNamespaceProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+    public setNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -14699,7 +13018,7 @@ public class ManagerClientService {
       return this.ns;
     }
 
-    public modifyNamespaceProperties_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) {
+    public setNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) {
       this.ns = ns;
       return this;
     }
@@ -14720,27 +13039,52 @@ public class ManagerClientService {
     }
 
     @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() {
-      return this.vProperties;
+    public java.lang.String getProperty() {
+      return this.property;
     }
 
-    public modifyNamespaceProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) {
-      this.vProperties = vProperties;
+    public setNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
+      this.property = property;
       return this;
     }
 
-    public void unsetVProperties() {
-      this.vProperties = null;
+    public void unsetProperty() {
+      this.property = null;
     }
 
-    /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */
-    public boolean isSetVProperties() {
-      return this.vProperties != null;
+    /** Returns true if field property is set (has been assigned a value) and false otherwise */
+    public boolean isSetProperty() {
+      return this.property != null;
     }
 
-    public void setVPropertiesIsSet(boolean value) {
+    public void setPropertyIsSet(boolean value) {
       if (!value) {
-        this.vProperties = null;
+        this.property = null;
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getValue() {
+      return this.value;
+    }
+
+    public setNamespaceProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) {
+      this.value = value;
+      return this;
+    }
+
+    public void unsetValue() {
+      this.value = null;
+    }
+
+    /** Returns true if field value is set (has been assigned a value) and false otherwise */
+    public boolean isSetValue() {
+      return this.value != null;
+    }
+
+    public void setValueIsSet(boolean value) {
+      if (!value) {
+        this.value = null;
       }
     }
 
@@ -14771,11 +13115,19 @@ public class ManagerClientService {
         }
         break;
 
-      case V_PROPERTIES:
+      case PROPERTY:
         if (value == null) {
-          unsetVProperties();
+          unsetProperty();
         } else {
-          setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value);
+          setProperty((java.lang.String)value);
+        }
+        break;
+
+      case VALUE:
+        if (value == null) {
+          unsetValue();
+        } else {
+          setValue((java.lang.String)value);
         }
         break;
 
@@ -14795,8 +13147,11 @@ public class ManagerClientService {
       case NS:
         return getNs();
 
-      case V_PROPERTIES:
-        return getVProperties();
+      case PROPERTY:
+        return getProperty();
+
+      case VALUE:
+        return getValue();
 
       }
       throw new java.lang.IllegalStateException();
@@ -14816,20 +13171,22 @@ public class ManagerClientService {
         return isSetCredentials();
       case NS:
         return isSetNs();
-      case V_PROPERTIES:
-        return isSetVProperties();
+      case PROPERTY:
+        return isSetProperty();
+      case VALUE:
+        return isSetValue();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof modifyNamespaceProperties_args)
-        return this.equals((modifyNamespaceProperties_args)that);
+      if (that instanceof setNamespaceProperty_args)
+        return this.equals((setNamespaceProperty_args)that);
       return false;
     }
 
-    public boolean equals(modifyNamespaceProperties_args that) {
+    public boolean equals(setNamespaceProperty_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -14862,12 +13219,21 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_vProperties = true && this.isSetVProperties();
-      boolean that_present_vProperties = true && that.isSetVProperties();
-      if (this_present_vProperties || that_present_vProperties) {
-        if (!(this_present_vProperties && that_present_vProperties))
+      boolean this_present_property = true && this.isSetProperty();
+      boolean that_present_property = true && that.isSetProperty();
+      if (this_present_property || that_present_property) {
+        if (!(this_present_property && that_present_property))
           return false;
-        if (!this.vProperties.equals(that.vProperties))
+        if (!this.property.equals(that.property))
+          return false;
+      }
+
+      boolean this_present_value = true && this.isSetValue();
+      boolean that_present_value = true && that.isSetValue();
+      if (this_present_value || that_present_value) {
+        if (!(this_present_value && that_present_value))
+          return false;
+        if (!this.value.equals(that.value))
           return false;
       }
 
@@ -14890,15 +13256,19 @@ public class ManagerClientService {
       if (isSetNs())
         hashCode = hashCode * 8191 + ns.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287);
-      if (isSetVProperties())
-        hashCode = hashCode * 8191 + vProperties.hashCode();
+      hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287);
+      if (isSetProperty())
+        hashCode = hashCode * 8191 + property.hashCode();
+
+      hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+      if (isSetValue())
+        hashCode = hashCode * 8191 + value.hashCode();
 
       return hashCode;
     }
 
     @Override
-    public int compareTo(modifyNamespaceProperties_args other) {
+    public int compareTo(setNamespaceProperty_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -14935,12 +13305,22 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetVProperties()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties);
+      if (isSetProperty()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetValue()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -14966,7 +13346,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_args(");
       boolean first = true;
 
       sb.append("tinfo:");
@@ -14993,11 +13373,19 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("vProperties:");
-      if (this.vProperties == null) {
+      sb.append("property:");
+      if (this.property == null) {
         sb.append("null");
       } else {
-        sb.append(this.vProperties);
+        sb.append(this.property);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("value:");
+      if (this.value == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.value);
       }
       first = false;
       sb.append(")");
@@ -15013,9 +13401,6 @@ public class ManagerClientService {
       if (credentials != null) {
         credentials.validate();
       }
-      if (vProperties != null) {
-        vProperties.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -15034,17 +13419,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class modifyNamespaceProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyNamespaceProperties_argsStandardScheme getScheme() {
-        return new modifyNamespaceProperties_argsStandardScheme();
+      public setNamespaceProperty_argsStandardScheme getScheme() {
+        return new setNamespaceProperty_argsStandardScheme();
       }
     }
 
-    private static class modifyNamespaceProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyNamespaceProperties_args> {
+    private static class setNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setNamespaceProperty_args> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -15080,11 +13465,18 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // V_PROPERTIES
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
-                struct.vProperties.read(iprot);
-                struct.setVPropertiesIsSet(true);
+            case 4: // PROPERTY
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.property = iprot.readString();
+                struct.setPropertyIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // VALUE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.value = iprot.readString();
+                struct.setValueIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -15101,7 +13493,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -15120,9 +13512,14 @@ public class ManagerClientService {
           oprot.writeString(struct.ns);
           oprot.writeFieldEnd();
         }
-        if (struct.vProperties != null) {
-          oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC);
-          struct.vProperties.write(oprot);
+        if (struct.property != null) {
+          oprot.writeFieldBegin(PROPERTY_FIELD_DESC);
+          oprot.writeString(struct.property);
+          oprot.writeFieldEnd();
+        }
+        if (struct.value != null) {
+          oprot.writeFieldBegin(VALUE_FIELD_DESC);
+          oprot.writeString(struct.value);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -15131,17 +13528,17 @@ public class ManagerClientService {
 
     }
 
-    private static class modifyNamespaceProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyNamespaceProperties_argsTupleScheme getScheme() {
-        return new modifyNamespaceProperties_argsTupleScheme();
+      public setNamespaceProperty_argsTupleScheme getScheme() {
+        return new setNamespaceProperty_argsTupleScheme();
       }
     }
 
-    private static class modifyNamespaceProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyNamespaceProperties_args> {
+    private static class setNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setNamespaceProperty_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetTinfo()) {
@@ -15153,10 +13550,13 @@ public class ManagerClientService {
         if (struct.isSetNs()) {
           optionals.set(2);
         }
-        if (struct.isSetVProperties()) {
+        if (struct.isSetProperty()) {
           optionals.set(3);
         }
-        oprot.writeBitSet(optionals, 4);
+        if (struct.isSetValue()) {
+          optionals.set(4);
+        }
+        oprot.writeBitSet(optionals, 5);
         if (struct.isSetTinfo()) {
           struct.tinfo.write(oprot);
         }
@@ -15166,15 +13566,18 @@ public class ManagerClientService {
         if (struct.isSetNs()) {
           oprot.writeString(struct.ns);
         }
-        if (struct.isSetVProperties()) {
-          struct.vProperties.write(oprot);
+        if (struct.isSetProperty()) {
+          oprot.writeString(struct.property);
+        }
+        if (struct.isSetValue()) {
+          oprot.writeString(struct.value);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(4);
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo();
           struct.tinfo.read(iprot);
@@ -15190,9 +13593,12 @@ public class ManagerClientService {
           struct.setNsIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
-          struct.vProperties.read(iprot);
-          struct.setVPropertiesIsSet(true);
+          struct.property = iprot.readString();
+          struct.setPropertyIsSet(true);
+        }
+        if (incoming.get(4)) {
+          struct.value = iprot.readString();
+          struct.setValueIsSet(true);
         }
       }
     }
@@ -15203,22 +13609,20 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class modifyNamespaceProperties_result implements org.apache.thrift.TBase<modifyNamespaceProperties_result, modifyNamespaceProperties_result._Fields>, java.io.Serializable, Cloneable, Comparable<modifyNamespaceProperties_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_result");
+  public static class setNamespaceProperty_result implements org.apache.thrift.TBase<setNamespaceProperty_result, setNamespaceProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<setNamespaceProperty_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_result");
 
     private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-    private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_resultTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
-    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required
     public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -15226,8 +13630,7 @@ public class ManagerClientService {
       SEC((short)1, "sec"),
       TOPE((short)2, "tope"),
       TNASE((short)3, "tnase"),
-      TCME((short)4, "tcme"),
-      TPE((short)5, "tpe");
+      TPE((short)4, "tpe");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -15249,9 +13652,7 @@ public class ManagerClientService {
             return TOPE;
           case 3: // TNASE
             return TNASE;
-          case 4: // TCME
-            return TCME;
-          case 5: // TPE
+          case 4: // TPE
             return TPE;
           default:
             return null;
@@ -15305,36 +13706,32 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
       tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
-      tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class)));
       tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_result.class, metaDataMap);
     }
 
-    public modifyNamespaceProperties_result() {
+    public setNamespaceProperty_result() {
     }
 
-    public modifyNamespaceProperties_result(
+    public setNamespaceProperty_result(
       org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
       org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
       org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme,
       ThriftPropertyException tpe)
     {
       this();
       this.sec = sec;
       this.tope = tope;
       this.tnase = tnase;
-      this.tcme = tcme;
       this.tpe = tpe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public modifyNamespaceProperties_result(modifyNamespaceProperties_result other) {
+    public setNamespaceProperty_result(setNamespaceProperty_result other) {
       if (other.isSetSec()) {
         this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
       }
@@ -15344,17 +13741,14 @@ public class ManagerClientService {
       if (other.isSetTnase()) {
         this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
       }
-      if (other.isSetTcme()) {
-        this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme);
-      }
       if (other.isSetTpe()) {
         this.tpe = new ThriftPropertyException(other.tpe);
       }
     }
 
     @Override
-    public modifyNamespaceProperties_result deepCopy() {
-      return new modifyNamespaceProperties_result(this);
+    public setNamespaceProperty_result deepCopy() {
+      return new setNamespaceProperty_result(this);
     }
 
     @Override
@@ -15362,7 +13756,6 @@ public class ManagerClientService {
       this.sec = null;
       this.tope = null;
       this.tnase = null;
-      this.tcme = null;
       this.tpe = null;
     }
 
@@ -15371,7 +13764,7 @@ public class ManagerClientService {
       return this.sec;
     }
 
-    public modifyNamespaceProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+    public setNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
       this.sec = sec;
       return this;
     }
@@ -15396,7 +13789,7 @@ public class ManagerClientService {
       return this.tope;
     }
 
-    public modifyNamespaceProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
+    public setNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
       this.tope = tope;
       return this;
     }
@@ -15421,7 +13814,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public modifyNamespaceProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public setNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -15441,37 +13834,12 @@ public class ManagerClientService {
       }
     }
 
-    @org.apache.thrift.annotation.Nullable
-    public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() {
-      return this.tcme;
-    }
-
-    public modifyNamespaceProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) {
-      this.tcme = tcme;
-      return this;
-    }
-
-    public void unsetTcme() {
-      this.tcme = null;
-    }
-
-    /** Returns true if field tcme is set (has been assigned a value) and false otherwise */
-    public boolean isSetTcme() {
-      return this.tcme != null;
-    }
-
-    public void setTcmeIsSet(boolean value) {
-      if (!value) {
-        this.tcme = null;
-      }
-    }
-
     @org.apache.thrift.annotation.Nullable
     public ThriftPropertyException getTpe() {
       return this.tpe;
     }
 
-    public modifyNamespaceProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
+    public setNamespaceProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
       this.tpe = tpe;
       return this;
     }
@@ -15518,14 +13886,6 @@ public class ManagerClientService {
         }
         break;
 
-      case TCME:
-        if (value == null) {
-          unsetTcme();
-        } else {
-          setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value);
-        }
-        break;
-
       case TPE:
         if (value == null) {
           unsetTpe();
@@ -15550,9 +13910,6 @@ public class ManagerClientService {
       case TNASE:
         return getTnase();
 
-      case TCME:
-        return getTcme();
-
       case TPE:
         return getTpe();
 
@@ -15574,8 +13931,6 @@ public class ManagerClientService {
         return isSetTope();
       case TNASE:
         return isSetTnase();
-      case TCME:
-        return isSetTcme();
       case TPE:
         return isSetTpe();
       }
@@ -15584,12 +13939,12 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof modifyNamespaceProperties_result)
-        return this.equals((modifyNamespaceProperties_result)that);
+      if (that instanceof setNamespaceProperty_result)
+        return this.equals((setNamespaceProperty_result)that);
       return false;
     }
 
-    public boolean equals(modifyNamespaceProperties_result that) {
+    public boolean equals(setNamespaceProperty_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -15622,15 +13977,6 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_tcme = true && this.isSetTcme();
-      boolean that_present_tcme = true && that.isSetTcme();
-      if (this_present_tcme || that_present_tcme) {
-        if (!(this_present_tcme && that_present_tcme))
-          return false;
-        if (!this.tcme.equals(that.tcme))
-          return false;
-      }
-
       boolean this_present_tpe = true && this.isSetTpe();
       boolean that_present_tpe = true && that.isSetTpe();
       if (this_present_tpe || that_present_tpe) {
@@ -15659,10 +14005,6 @@ public class ManagerClientService {
       if (isSetTnase())
         hashCode = hashCode * 8191 + tnase.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287);
-      if (isSetTcme())
-        hashCode = hashCode * 8191 + tcme.hashCode();
-
       hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
       if (isSetTpe())
         hashCode = hashCode * 8191 + tpe.hashCode();
@@ -15671,7 +14013,7 @@ public class ManagerClientService {
     }
 
     @Override
-    public int compareTo(modifyNamespaceProperties_result other) {
+    public int compareTo(setNamespaceProperty_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -15708,16 +14050,6 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTcme()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe());
       if (lastComparison != 0) {
         return lastComparison;
@@ -15748,7 +14080,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_result(");
       boolean first = true;
 
       sb.append("sec:");
@@ -15775,14 +14107,6 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("tcme:");
-      if (this.tcme == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.tcme);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("tpe:");
       if (this.tpe == null) {
         sb.append("null");
@@ -15815,17 +14139,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class modifyNamespaceProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyNamespaceProperties_resultStandardScheme getScheme() {
-        return new modifyNamespaceProperties_resultStandardScheme();
+      public setNamespaceProperty_resultStandardScheme getScheme() {
+        return new setNamespaceProperty_resultStandardScheme();
       }
     }
 
-    private static class modifyNamespaceProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyNamespaceProperties_result> {
+    private static class setNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setNamespaceProperty_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -15862,16 +14186,7 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // TCME
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
-                struct.tcme.read(iprot);
-                struct.setTcmeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 5: // TPE
+            case 4: // TPE
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
                 struct.tpe = new ThriftPropertyException();
                 struct.tpe.read(iprot);
@@ -15892,7 +14207,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -15911,11 +14226,6 @@ public class ManagerClientService {
           struct.tnase.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.tcme != null) {
-          oprot.writeFieldBegin(TCME_FIELD_DESC);
-          struct.tcme.write(oprot);
-          oprot.writeFieldEnd();
-        }
         if (struct.tpe != null) {
           oprot.writeFieldBegin(TPE_FIELD_DESC);
           struct.tpe.write(oprot);
@@ -15927,17 +14237,17 @@ public class ManagerClientService {
 
     }
 
-    private static class modifyNamespaceProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class setNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public modifyNamespaceProperties_resultTupleScheme getScheme() {
-        return new modifyNamespaceProperties_resultTupleScheme();
+      public setNamespaceProperty_resultTupleScheme getScheme() {
+        return new setNamespaceProperty_resultTupleScheme();
       }
     }
 
-    private static class modifyNamespaceProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyNamespaceProperties_result> {
+    private static class setNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setNamespaceProperty_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSec()) {
@@ -15949,13 +14259,10 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           optionals.set(2);
         }
-        if (struct.isSetTcme()) {
-          optionals.set(3);
-        }
         if (struct.isSetTpe()) {
-          optionals.set(4);
+          optionals.set(3);
         }
-        oprot.writeBitSet(optionals, 5);
+        oprot.writeBitSet(optionals, 4);
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -15965,18 +14272,15 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           struct.tnase.write(oprot);
         }
-        if (struct.isSetTcme()) {
-          struct.tcme.write(oprot);
-        }
         if (struct.isSetTpe()) {
           struct.tpe.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(5);
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
           struct.sec.read(iprot);
@@ -15993,11 +14297,6 @@ public class ManagerClientService {
           struct.setTnaseIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
-          struct.tcme.read(iprot);
-          struct.setTcmeIsSet(true);
-        }
-        if (incoming.get(4)) {
           struct.tpe = new ThriftPropertyException();
           struct.tpe.read(iprot);
           struct.setTpeIsSet(true);
@@ -16011,28 +14310,28 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class removeNamespaceProperty_args implements org.apache.thrift.TBase<removeNamespaceProperty_args, removeNamespaceProperty_args._Fields>, java.io.Serializable, Cloneable, Comparable<removeNamespaceProperty_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeNamespaceProperty_args");
+  public static class modifyNamespaceProperties_args implements org.apache.thrift.TBase<modifyNamespaceProperties_args, modifyNamespaceProperties_args._Fields>, java.io.Serializable, Cloneable, Comparable<modifyNamespaceProperties_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4);
+    private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeNamespaceProperty_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeNamespaceProperty_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_argsTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required
     public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required
-    public @org.apache.thrift.annotation.Nullable java.lang.String property; // required
+    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
       CREDENTIALS((short)2, "credentials"),
       NS((short)3, "ns"),
-      PROPERTY((short)4, "property");
+      V_PROPERTIES((short)4, "vProperties");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -16054,8 +14353,8 @@ public class ManagerClientService {
             return CREDENTIALS;
           case 3: // NS
             return NS;
-          case 4: // PROPERTY
-            return PROPERTY;
+          case 4: // V_PROPERTIES
+            return V_PROPERTIES;
           default:
             return null;
         }
@@ -16108,32 +14407,32 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class)));
       tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeNamespaceProperty_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_args.class, metaDataMap);
     }
 
-    public removeNamespaceProperty_args() {
+    public modifyNamespaceProperties_args() {
     }
 
-    public removeNamespaceProperty_args(
+    public modifyNamespaceProperties_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
       java.lang.String ns,
-      java.lang.String property)
+      org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties)
     {
       this();
       this.tinfo = tinfo;
       this.credentials = credentials;
       this.ns = ns;
-      this.property = property;
+      this.vProperties = vProperties;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public removeNamespaceProperty_args(removeNamespaceProperty_args other) {
+    public modifyNamespaceProperties_args(modifyNamespaceProperties_args other) {
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo);
       }
@@ -16143,14 +14442,14 @@ public class ManagerClientService {
       if (other.isSetNs()) {
         this.ns = other.ns;
       }
-      if (other.isSetProperty()) {
-        this.property = other.property;
+      if (other.isSetVProperties()) {
+        this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties);
       }
     }
 
     @Override
-    public removeNamespaceProperty_args deepCopy() {
-      return new removeNamespaceProperty_args(this);
+    public modifyNamespaceProperties_args deepCopy() {
+      return new modifyNamespaceProperties_args(this);
     }
 
     @Override
@@ -16158,7 +14457,7 @@ public class ManagerClientService {
       this.tinfo = null;
       this.credentials = null;
       this.ns = null;
-      this.property = null;
+      this.vProperties = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -16166,7 +14465,7 @@ public class ManagerClientService {
       return this.tinfo;
     }
 
-    public removeNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
+    public modifyNamespaceProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) {
       this.tinfo = tinfo;
       return this;
     }
@@ -16191,7 +14490,7 @@ public class ManagerClientService {
       return this.credentials;
     }
 
-    public removeNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
+    public modifyNamespaceProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -16216,7 +14515,7 @@ public class ManagerClientService {
       return this.ns;
     }
 
-    public removeNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) {
+    public modifyNamespaceProperties_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) {
       this.ns = ns;
       return this;
     }
@@ -16237,27 +14536,27 @@ public class ManagerClientService {
     }
 
     @org.apache.thrift.annotation.Nullable
-    public java.lang.String getProperty() {
-      return this.property;
+    public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() {
+      return this.vProperties;
     }
 
-    public removeNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) {
-      this.property = property;
+    public modifyNamespaceProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) {
+      this.vProperties = vProperties;
       return this;
     }
 
-    public void unsetProperty() {
-      this.property = null;
+    public void unsetVProperties() {
+      this.vProperties = null;
     }
 
-    /** Returns true if field property is set (has been assigned a value) and false otherwise */
-    public boolean isSetProperty() {
-      return this.property != null;
+    /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */
+    public boolean isSetVProperties() {
+      return this.vProperties != null;
     }
 
-    public void setPropertyIsSet(boolean value) {
+    public void setVPropertiesIsSet(boolean value) {
       if (!value) {
-        this.property = null;
+        this.vProperties = null;
       }
     }
 
@@ -16288,11 +14587,11 @@ public class ManagerClientService {
         }
         break;
 
-      case PROPERTY:
+      case V_PROPERTIES:
         if (value == null) {
-          unsetProperty();
+          unsetVProperties();
         } else {
-          setProperty((java.lang.String)value);
+          setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value);
         }
         break;
 
@@ -16312,8 +14611,8 @@ public class ManagerClientService {
       case NS:
         return getNs();
 
-      case PROPERTY:
-        return getProperty();
+      case V_PROPERTIES:
+        return getVProperties();
 
       }
       throw new java.lang.IllegalStateException();
@@ -16333,20 +14632,20 @@ public class ManagerClientService {
         return isSetCredentials();
       case NS:
         return isSetNs();
-      case PROPERTY:
-        return isSetProperty();
+      case V_PROPERTIES:
+        return isSetVProperties();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof removeNamespaceProperty_args)
-        return this.equals((removeNamespaceProperty_args)that);
+      if (that instanceof modifyNamespaceProperties_args)
+        return this.equals((modifyNamespaceProperties_args)that);
       return false;
     }
 
-    public boolean equals(removeNamespaceProperty_args that) {
+    public boolean equals(modifyNamespaceProperties_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -16379,12 +14678,12 @@ public class ManagerClientService {
           return false;
       }
 
-      boolean this_present_property = true && this.isSetProperty();
-      boolean that_present_property = true && that.isSetProperty();
-      if (this_present_property || that_present_property) {
-        if (!(this_present_property && that_present_property))
+      boolean this_present_vProperties = true && this.isSetVProperties();
+      boolean that_present_vProperties = true && that.isSetVProperties();
+      if (this_present_vProperties || that_present_vProperties) {
+        if (!(this_present_vProperties && that_present_vProperties))
           return false;
-        if (!this.property.equals(that.property))
+        if (!this.vProperties.equals(that.vProperties))
           return false;
       }
 
@@ -16407,15 +14706,15 @@ public class ManagerClientService {
       if (isSetNs())
         hashCode = hashCode * 8191 + ns.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287);
-      if (isSetProperty())
-        hashCode = hashCode * 8191 + property.hashCode();
+      hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287);
+      if (isSetVProperties())
+        hashCode = hashCode * 8191 + vProperties.hashCode();
 
       return hashCode;
     }
 
     @Override
-    public int compareTo(removeNamespaceProperty_args other) {
+    public int compareTo(modifyNamespaceProperties_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -16452,12 +14751,12 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetProperty()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property);
+      if (isSetVProperties()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -16483,7 +14782,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("removeNamespaceProperty_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_args(");
       boolean first = true;
 
       sb.append("tinfo:");
@@ -16510,11 +14809,11 @@ public class ManagerClientService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("property:");
-      if (this.property == null) {
+      sb.append("vProperties:");
+      if (this.vProperties == null) {
         sb.append("null");
       } else {
-        sb.append(this.property);
+        sb.append(this.vProperties);
       }
       first = false;
       sb.append(")");
@@ -16530,6 +14829,9 @@ public class ManagerClientService {
       if (credentials != null) {
         credentials.validate();
       }
+      if (vProperties != null) {
+        vProperties.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -16548,17 +14850,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class removeNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyNamespaceProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeNamespaceProperty_argsStandardScheme getScheme() {
-        return new removeNamespaceProperty_argsStandardScheme();
+      public modifyNamespaceProperties_argsStandardScheme getScheme() {
+        return new modifyNamespaceProperties_argsStandardScheme();
       }
     }
 
-    private static class removeNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<removeNamespaceProperty_args> {
+    private static class modifyNamespaceProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyNamespaceProperties_args> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -16594,10 +14896,11 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 4: // PROPERTY
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.property = iprot.readString();
-                struct.setPropertyIsSet(true);
+            case 4: // V_PROPERTIES
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
+                struct.vProperties.read(iprot);
+                struct.setVPropertiesIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -16614,7 +14917,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -16633,9 +14936,9 @@ public class ManagerClientService {
           oprot.writeString(struct.ns);
           oprot.writeFieldEnd();
         }
-        if (struct.property != null) {
-          oprot.writeFieldBegin(PROPERTY_FIELD_DESC);
-          oprot.writeString(struct.property);
+        if (struct.vProperties != null) {
+          oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC);
+          struct.vProperties.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -16644,17 +14947,17 @@ public class ManagerClientService {
 
     }
 
-    private static class removeNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyNamespaceProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeNamespaceProperty_argsTupleScheme getScheme() {
-        return new removeNamespaceProperty_argsTupleScheme();
+      public modifyNamespaceProperties_argsTupleScheme getScheme() {
+        return new modifyNamespaceProperties_argsTupleScheme();
       }
     }
 
-    private static class removeNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<removeNamespaceProperty_args> {
+    private static class modifyNamespaceProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyNamespaceProperties_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetTinfo()) {
@@ -16666,7 +14969,7 @@ public class ManagerClientService {
         if (struct.isSetNs()) {
           optionals.set(2);
         }
-        if (struct.isSetProperty()) {
+        if (struct.isSetVProperties()) {
           optionals.set(3);
         }
         oprot.writeBitSet(optionals, 4);
@@ -16679,13 +14982,13 @@ public class ManagerClientService {
         if (struct.isSetNs()) {
           oprot.writeString(struct.ns);
         }
-        if (struct.isSetProperty()) {
-          oprot.writeString(struct.property);
+        if (struct.isSetVProperties()) {
+          struct.vProperties.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
@@ -16703,8 +15006,9 @@ public class ManagerClientService {
           struct.setNsIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.property = iprot.readString();
-          struct.setPropertyIsSet(true);
+          struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties();
+          struct.vProperties.read(iprot);
+          struct.setVPropertiesIsSet(true);
         }
       }
     }
@@ -16715,25 +15019,31 @@ public class ManagerClientService {
   }
 
   @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-  public static class removeNamespaceProperty_result implements org.apache.thrift.TBase<removeNamespaceProperty_result, removeNamespaceProperty_result._Fields>, java.io.Serializable, Cloneable, Comparable<removeNamespaceProperty_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeNamespaceProperty_result");
+  public static class modifyNamespaceProperties_result implements org.apache.thrift.TBase<modifyNamespaceProperties_result, modifyNamespaceProperties_result._Fields>, java.io.Serializable, Cloneable, Comparable<modifyNamespaceProperties_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_result");
 
     private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+    private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeNamespaceProperty_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeNamespaceProperty_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_resultTupleSchemeFactory();
 
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required
     public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required
+    public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required
+    public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SEC((short)1, "sec"),
       TOPE((short)2, "tope"),
-      TNASE((short)3, "tnase");
+      TNASE((short)3, "tnase"),
+      TCME((short)4, "tcme"),
+      TPE((short)5, "tpe");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -16755,6 +15065,10 @@ public class ManagerClientService {
             return TOPE;
           case 3: // TNASE
             return TNASE;
+          case 4: // TCME
+            return TCME;
+          case 5: // TPE
+            return TPE;
           default:
             return null;
         }
@@ -16807,28 +15121,36 @@ public class ManagerClientService {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class)));
       tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class)));
+      tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class)));
+      tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeNamespaceProperty_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_result.class, metaDataMap);
     }
 
-    public removeNamespaceProperty_result() {
+    public modifyNamespaceProperties_result() {
     }
 
-    public removeNamespaceProperty_result(
+    public modifyNamespaceProperties_result(
       org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec,
       org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope,
-      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase)
+      org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase,
+      org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme,
+      ThriftPropertyException tpe)
     {
       this();
       this.sec = sec;
       this.tope = tope;
       this.tnase = tnase;
+      this.tcme = tcme;
+      this.tpe = tpe;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public removeNamespaceProperty_result(removeNamespaceProperty_result other) {
+    public modifyNamespaceProperties_result(modifyNamespaceProperties_result other) {
       if (other.isSetSec()) {
         this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec);
       }
@@ -16838,11 +15160,17 @@ public class ManagerClientService {
       if (other.isSetTnase()) {
         this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase);
       }
+      if (other.isSetTcme()) {
+        this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme);
+      }
+      if (other.isSetTpe()) {
+        this.tpe = new ThriftPropertyException(other.tpe);
+      }
     }
 
     @Override
-    public removeNamespaceProperty_result deepCopy() {
-      return new removeNamespaceProperty_result(this);
+    public modifyNamespaceProperties_result deepCopy() {
+      return new modifyNamespaceProperties_result(this);
     }
 
     @Override
@@ -16850,6 +15178,8 @@ public class ManagerClientService {
       this.sec = null;
       this.tope = null;
       this.tnase = null;
+      this.tcme = null;
+      this.tpe = null;
     }
 
     @org.apache.thrift.annotation.Nullable
@@ -16857,7 +15187,7 @@ public class ManagerClientService {
       return this.sec;
     }
 
-    public removeNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
+    public modifyNamespaceProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) {
       this.sec = sec;
       return this;
     }
@@ -16882,7 +15212,7 @@ public class ManagerClientService {
       return this.tope;
     }
 
-    public removeNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
+    public modifyNamespaceProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) {
       this.tope = tope;
       return this;
     }
@@ -16907,7 +15237,7 @@ public class ManagerClientService {
       return this.tnase;
     }
 
-    public removeNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
+    public modifyNamespaceProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
       this.tnase = tnase;
       return this;
     }
@@ -16927,6 +15257,56 @@ public class ManagerClientService {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
+    public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() {
+      return this.tcme;
+    }
+
+    public modifyNamespaceProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) {
+      this.tcme = tcme;
+      return this;
+    }
+
+    public void unsetTcme() {
+      this.tcme = null;
+    }
+
+    /** Returns true if field tcme is set (has been assigned a value) and false otherwise */
+    public boolean isSetTcme() {
+      return this.tcme != null;
+    }
+
+    public void setTcmeIsSet(boolean value) {
+      if (!value) {
+        this.tcme = null;
+      }
+    }
+
+    @org.apache.thrift.annotation.Nullable
+    public ThriftPropertyException getTpe() {
+      return this.tpe;
+    }
+
+    public modifyNamespaceProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) {
+      this.tpe = tpe;
+      return this;
+    }
+
+    public void unsetTpe() {
+      this.tpe = null;
+    }
+
+    /** Returns true if field tpe is set (has been assigned a value) and false otherwise */
+    public boolean isSetTpe() {
+      return this.tpe != null;
+    }
+
+    public void setTpeIsSet(boolean value) {
+      if (!value) {
+        this.tpe = null;
+      }
+    }
+
     @Override
     public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
@@ -16954,6 +15334,22 @@ public class ManagerClientService {
         }
         break;
 
+      case TCME:
+        if (value == null) {
+          unsetTcme();
+        } else {
+          setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value);
+        }
+        break;
+
+      case TPE:
+        if (value == null) {
+          unsetTpe();
+        } else {
+          setTpe((ThriftPropertyException)value);
+        }
+        break;
+
       }
     }
 
@@ -16970,6 +15366,12 @@ public class ManagerClientService {
       case TNASE:
         return getTnase();
 
+      case TCME:
+        return getTcme();
+
+      case TPE:
+        return getTpe();
+
       }
       throw new java.lang.IllegalStateException();
     }
@@ -16988,18 +15390,22 @@ public class ManagerClientService {
         return isSetTope();
       case TNASE:
         return isSetTnase();
+      case TCME:
+        return isSetTcme();
+      case TPE:
+        return isSetTpe();
       }
       throw new java.lang.IllegalStateException();
     }
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that instanceof removeNamespaceProperty_result)
-        return this.equals((removeNamespaceProperty_result)that);
+      if (that instanceof modifyNamespaceProperties_result)
+        return this.equals((modifyNamespaceProperties_result)that);
       return false;
     }
 
-    public boolean equals(removeNamespaceProperty_result that) {
+    public boolean equals(modifyNamespaceProperties_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -17032,6 +15438,24 @@ public class ManagerClientService {
           return false;
       }
 
+      boolean this_present_tcme = true && this.isSetTcme();
+      boolean that_present_tcme = true && that.isSetTcme();
+      if (this_present_tcme || that_present_tcme) {
+        if (!(this_present_tcme && that_present_tcme))
+          return false;
+        if (!this.tcme.equals(that.tcme))
+          return false;
+      }
+
+      boolean this_present_tpe = true && this.isSetTpe();
+      boolean that_present_tpe = true && that.isSetTpe();
+      if (this_present_tpe || that_present_tpe) {
+        if (!(this_present_tpe && that_present_tpe))
+          return false;
+        if (!this.tpe.equals(that.tpe))
+          return false;
+      }
+
       return true;
     }
 
@@ -17051,11 +15475,19 @@ public class ManagerClientService {
       if (isSetTnase())
         hashCode = hashCode * 8191 + tnase.hashCode();
 
+      hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287);
+      if (isSetTcme())
+        hashCode = hashCode * 8191 + tcme.hashCode();
+
+      hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+      if (isSetTpe())
+        hashCode = hashCode * 8191 + tpe.hashCode();
+
       return hashCode;
     }
 
     @Override
-    public int compareTo(removeNamespaceProperty_result other) {
+    public int compareTo(modifyNamespaceProperties_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -17092,6 +15524,26 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
+      lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTcme()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTpe()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -17112,7 +15564,7 @@ public class ManagerClientService {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("removeNamespaceProperty_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_result(");
       boolean first = true;
 
       sb.append("sec:");
@@ -17138,6 +15590,22 @@ public class ManagerClientService {
         sb.append(this.tnase);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("tcme:");
+      if (this.tcme == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.tcme);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("tpe:");
+      if (this.tpe == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.tpe);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -17163,17 +15631,17 @@ public class ManagerClientService {
       }
     }
 
-    private static class removeNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyNamespaceProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeNamespaceProperty_resultStandardScheme getScheme() {
-        return new removeNamespaceProperty_resultStandardScheme();
+      public modifyNamespaceProperties_resultStandardScheme getScheme() {
+        return new modifyNamespaceProperties_resultStandardScheme();
       }
     }
 
-    private static class removeNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<removeNamespaceProperty_result> {
+    private static class modifyNamespaceProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<modifyNamespaceProperties_result> {
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -17210,6 +15678,24 @@ public class ManagerClientService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
+            case 4: // TCME
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException();
+                struct.tcme.read(iprot);
+                struct.setTcmeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 5: // TPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.tpe = new ThriftPropertyException();
+                struct.tpe.read(iprot);
+                struct.setTpeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -17222,7 +15708,7 @@ public class ManagerClientService {
       }
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -17241,23 +15727,33 @@ public class ManagerClientService {
           struct.tnase.write(oprot);
           oprot.writeFieldEnd();
         }
+        if (struct.tcme != null) {
+          oprot.writeFieldBegin(TCME_FIELD_DESC);
+          struct.tcme.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.tpe != null) {
+          oprot.writeFieldBegin(TPE_FIELD_DESC);
+          struct.tpe.write(oprot);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class removeNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+    private static class modifyNamespaceProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       @Override
-      public removeNamespaceProperty_resultTupleScheme getScheme() {
-        return new removeNamespaceProperty_resultTupleScheme();
+      public modifyNamespaceProperties_resultTupleScheme getScheme() {
+        return new modifyNamespaceProperties_resultTupleScheme();
       }
     }
 
-    private static class removeNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<removeNamespaceProperty_result> {
+    private static class modifyNamespaceProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<modifyNamespaceProperties_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSec()) {
@@ -17269,7 +15765,13 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           optionals.set(2);
         }
-        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetTcme()) {
+          optionals.set(3);
+        }
+        if (struct.isSetTpe()) {
+          optionals.set(4);
+        }
+        oprot.writeBitSet(optionals, 5);
         if (struct.isSetSec()) {
           struct.sec.write(oprot);
         }
@@ -17279,12 +15781,18 @@ public class ManagerClientService {
         if (struct.isSetTnase()) {
           struct.tnase.write(oprot);
         }
+        if (struct.isSetTcme()) {
+          struct.tcme.write(oprot);
+        }
+        if (struct.isSetTpe()) {
+          struct.tpe.write(oprot);
+        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        java.util.BitSet incoming = iprot.readBitSet(3);
... 17758 lines suppressed ...