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

mmiller pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


    from 9c4858f  Merge branch '1.7' into 1.8
     add b0016c3  ACCUMULO-4702 Code fixes to work with Guava 23 (#297)
     new 8627532  Merge branch '1.7' into 1.8
     new 8a966a0  ACCUMULO-4702 Replaced uses of Guava HostAndPort

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/client/impl/ConditionalWriterImpl.java    |   3 +-
 .../core/client/impl/InstanceOperationsImpl.java   |   3 +-
 .../accumulo/core/client/impl/MasterClient.java    |   3 +-
 .../core/client/impl/ReplicationClient.java        |   3 +-
 .../core/client/impl/TableOperationsImpl.java      |   2 +-
 .../impl/TabletServerBatchReaderIterator.java      |   3 +-
 .../core/client/impl/TabletServerBatchWriter.java  |   2 +-
 .../accumulo/core/client/impl/ThriftScanner.java   |   3 +-
 .../core/client/impl/ThriftTransportKey.java       |   2 +-
 .../core/client/impl/ThriftTransportPool.java      |   2 +-
 .../apache/accumulo/core/client/impl/Writer.java   |   3 +-
 .../accumulo/core/rpc/TTimeoutTransport.java       |   5 +-
 .../org/apache/accumulo/core/rpc/ThriftUtil.java   |  13 +-
 .../org/apache/accumulo/core/util/AddressUtil.java |   2 +-
 .../org/apache/accumulo/core/util/HostAndPort.java | 268 +++++++++++++++++++++
 .../apache/accumulo/core/util/ServerServices.java  |   2 +-
 .../core/client/impl/ThriftTransportKeyTest.java   |   3 +-
 .../main/java/org/apache/accumulo/proxy/Proxy.java |   2 +-
 .../accumulo/server/client/BulkImporter.java       |   3 +-
 .../accumulo/server/master/LiveTServerSet.java     |   3 +-
 .../server/master/state/SuspendingTServer.java     |   3 +-
 .../server/master/state/TServerInstance.java       |   5 +-
 .../server/master/state/ZooTabletStateStore.java   |   3 +-
 .../apache/accumulo/server/rpc/ServerAddress.java  |   3 +-
 .../apache/accumulo/server/rpc/TServerUtils.java   |  21 +-
 .../org/apache/accumulo/server/util/Admin.java     |   2 +-
 .../apache/accumulo/server/util/LocalityCheck.java |   5 +-
 .../server/util/VerifyTabletAssignments.java       |   2 +-
 .../server/watcher/MonitorLog4jWatcher.java        |   5 +-
 .../org/apache/accumulo/server/AccumuloTest.java   |   3 +-
 .../accumulo/server/master/LiveTServerSetTest.java |   3 +-
 .../master/balancer/ChaoticLoadBalancerTest.java   |   3 +-
 .../master/balancer/DefaultLoadBalancerTest.java   |   3 +-
 .../master/balancer/TableLoadBalancerTest.java     |   2 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |   5 +-
 .../replication/CloseWriteAheadLogReferences.java  |   2 +-
 .../apache/accumulo/master/tableOps/LoadFiles.java |   3 +-
 .../MasterReplicationCoordinatorTest.java          |   3 +-
 .../master/state/RootTabletStateStoreTest.java     |   3 +-
 .../java/org/apache/accumulo/monitor/Monitor.java  |   3 +-
 .../apache/accumulo/monitor/ZooKeeperStatus.java   |   3 +-
 .../accumulo/monitor/servlets/MasterServlet.java   |   6 +-
 .../accumulo/monitor/servlets/ScanServlet.java     |   3 +-
 .../accumulo/monitor/servlets/TServersServlet.java |   5 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  11 +-
 .../tserver/replication/AccumuloReplicaSystem.java |   3 +-
 .../apache/accumulo/tserver/tablet/TabletTest.java |   5 +-
 .../org/apache/accumulo/test/TotalQueuedIT.java    |   3 +-
 .../org/apache/accumulo/test/WrongTabletTest.java  |   2 +-
 .../test/functional/WatchTheWatchCountIT.java      |   5 +-
 .../accumulo/test/functional/ZombieTServer.java    |   3 +-
 .../apache/accumulo/test/master/MergeStateIT.java  |   3 +-
 .../accumulo/test/master/SuspendedTabletsIT.java   |   2 +-
 .../metadata/MetadataBatchScanTest.java            |   2 +-
 .../test/performance/scan/CollectTabletStats.java  |   4 +-
 .../test/performance/thrift/NullTserver.java       |   2 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java     |   2 +-
 .../accumulo/test/proxy/SimpleProxyBase.java       |   2 +-
 .../test/proxy/TestProxyInstanceOperations.java    |   3 +-
 .../test/proxy/TestProxyNamespaceOperations.java   |   3 +-
 .../accumulo/test/proxy/TestProxyReadWrite.java    |   3 +-
 .../test/proxy/TestProxySecurityOperations.java    |   3 +-
 .../test/proxy/TestProxyTableOperations.java       |   3 +-
 ...GarbageCollectorCommunicatesWithTServersIT.java |   3 +-
 .../replication/MultiTserverReplicationIT.java     |   2 +-
 65 files changed, 363 insertions(+), 135 deletions(-)
 create mode 100644 
core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to