accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/4] accumulo git commit: Merge branch 'ACCUMULO-4115'
Date Sun, 24 Jan 2016 14:41:39 GMT
Merge branch 'ACCUMULO-4115'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d99238d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d99238d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d99238d

Branch: refs/heads/master
Commit: 2d99238d5563de5ef77aa278fd887a186d0dd8e4
Parents: 104e8dc d43685c
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Sun Jan 24 09:39:53 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Sun Jan 24 09:39:53 2016 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/client/impl/thrift/ClientService.java | 2 +-
 .../org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java    | 2 +-
 .../accumulo/core/client/impl/thrift/ThriftSecurityException.java  | 2 +-
 .../core/client/impl/thrift/ThriftTableOperationException.java     | 2 +-
 .../org/apache/accumulo/core/client/impl/thrift/ThriftTest.java    | 2 +-
 .../org/apache/accumulo/core/data/thrift/InitialMultiScan.java     | 2 +-
 .../java/org/apache/accumulo/core/data/thrift/InitialScan.java     | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/IterInfo.java   | 2 +-
 .../java/org/apache/accumulo/core/data/thrift/MapFileInfo.java     | 2 +-
 .../java/org/apache/accumulo/core/data/thrift/MultiScanResult.java | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/ScanResult.java | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/TCMResult.java  | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/TColumn.java    | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/TCondition.java | 2 +-
 .../org/apache/accumulo/core/data/thrift/TConditionalMutation.java | 2 +-
 .../org/apache/accumulo/core/data/thrift/TConditionalSession.java  | 2 +-
 .../accumulo/core/data/thrift/TConstraintViolationSummary.java     | 2 +-
 core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java  | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java  | 2 +-
 .../main/java/org/apache/accumulo/core/data/thrift/TMutation.java  | 2 +-
 .../src/main/java/org/apache/accumulo/core/data/thrift/TRange.java | 2 +-
 .../java/org/apache/accumulo/core/data/thrift/UpdateErrors.java    | 2 +-
 .../java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java  | 2 +-
 .../src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java | 2 +-
 .../main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java | 2 +-
 .../org/apache/accumulo/core/master/thrift/BulkImportStatus.java   | 2 +-
 .../java/org/apache/accumulo/core/master/thrift/Compacting.java    | 2 +-
 .../java/org/apache/accumulo/core/master/thrift/DeadServer.java    | 2 +-
 .../java/org/apache/accumulo/core/master/thrift/FateService.java   | 2 +-
 .../apache/accumulo/core/master/thrift/MasterClientService.java    | 2 +-
 .../org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java  | 2 +-
 .../org/apache/accumulo/core/master/thrift/RecoveryException.java  | 2 +-
 .../org/apache/accumulo/core/master/thrift/RecoveryStatus.java     | 2 +-
 .../java/org/apache/accumulo/core/master/thrift/TableInfo.java     | 2 +-
 .../org/apache/accumulo/core/master/thrift/TabletServerStatus.java | 2 +-
 .../java/org/apache/accumulo/core/master/thrift/TabletSplit.java   | 2 +-
 .../org/apache/accumulo/core/replication/thrift/KeyValues.java     | 2 +-
 .../core/replication/thrift/RemoteReplicationException.java        | 2 +-
 .../accumulo/core/replication/thrift/ReplicationCoordinator.java   | 2 +-
 .../core/replication/thrift/ReplicationCoordinatorException.java   | 2 +-
 .../accumulo/core/replication/thrift/ReplicationServicer.java      | 2 +-
 .../java/org/apache/accumulo/core/replication/thrift/WalEdits.java | 2 +-
 .../apache/accumulo/core/security/thrift/TAuthenticationKey.java   | 2 +-
 .../core/security/thrift/TAuthenticationTokenIdentifier.java       | 2 +-
 .../org/apache/accumulo/core/security/thrift/TCredentials.java     | 2 +-
 .../org/apache/accumulo/core/security/thrift/TDelegationToken.java | 2 +-
 .../accumulo/core/security/thrift/TDelegationTokenConfig.java      | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ActionStats.java  | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java   | 2 +-
 .../core/tabletserver/thrift/ConstraintViolationException.java     | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/IteratorConfig.java   | 2 +-
 .../accumulo/core/tabletserver/thrift/NoSuchScanIDException.java   | 2 +-
 .../core/tabletserver/thrift/NotServingTabletException.java        | 2 +-
 .../apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java | 2 +-
 .../core/tabletserver/thrift/TSampleNotPresentException.java       | 2 +-
 .../accumulo/core/tabletserver/thrift/TSamplerConfiguration.java   | 2 +-
 .../accumulo/core/tabletserver/thrift/TabletClientService.java     | 2 +-
 .../org/apache/accumulo/core/tabletserver/thrift/TabletStats.java  | 2 +-
 .../accumulo/core/tabletserver/thrift/TooManyFilesException.java   | 2 +-
 .../src/main/java/org/apache/accumulo/core/trace/thrift/TInfo.java | 2 +-
 core/src/main/scripts/generate-thrift.sh                           | 2 +-
 .../java/org/apache/accumulo/proxy/thrift/AccumuloException.java   | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java  | 2 +-
 .../apache/accumulo/proxy/thrift/AccumuloSecurityException.java    | 2 +-
 .../java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java    | 2 +-
 .../src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java | 2 +-
 .../java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java    | 2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java   | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java   | 2 +-
 .../org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java | 2 +-
 .../src/main/java/org/apache/accumulo/proxy/thrift/Condition.java  | 2 +-
 .../java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java  | 2 +-
 .../org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java | 2 +-
 .../src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java  | 2 +-
 .../java/org/apache/accumulo/proxy/thrift/IteratorSetting.java     | 2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java      | 2 +-
 .../src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java  | 2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java | 2 +-
 .../java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java     | 2 +-
 .../apache/accumulo/proxy/thrift/MutationsRejectedException.java   | 2 +-
 .../org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java   | 2 +-
 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java    | 2 +-
 .../src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java    | 2 +-
 .../src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java | 2 +-
 .../org/apache/accumulo/proxy/thrift/TableExistsException.java     | 2 +-
 .../org/apache/accumulo/proxy/thrift/TableNotFoundException.java   | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java  | 2 +-
 .../main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java  | 2 +-
 .../main/java/org/apache/accumulo/tracer/thrift/Annotation.java    | 2 +-
 .../main/java/org/apache/accumulo/tracer/thrift/RemoteSpan.java    | 2 +-
 .../main/java/org/apache/accumulo/tracer/thrift/SpanReceiver.java  | 2 +-
 .../main/java/org/apache/accumulo/tracer/thrift/TestService.java   | 2 +-
 96 files changed, 96 insertions(+), 96 deletions(-)
----------------------------------------------------------------------



Mime
View raw message