[accumulo] branch master updated: Update Bulk import monitor page. Closes #475 (#1101)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new 49fa5d6 Update Bulk import monitor page. Closes #475 (#1101) 49fa5d6 is described below commit 49fa5d65f051c4b1519dd525678d0f8c79839567 Author: Mike Miller AuthorDate: Wed Apr 17 17:54:25 2019 -0400 Update Bulk import monitor page. Closes #475 (#1101) --- .../main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl index 5795271..21f2b7a 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl @@ -22,7 +22,7 @@ -All Bulk Imports +Legacy Bulk Imports Directory Age
[accumulo] branch master updated: Include Guava's failureaccess in assembly (#1097)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new 8b58543 Include Guava's failureaccess in assembly (#1097) 8b58543 is described below commit 8b5854336c32fba8c1d041c491c14e13e0c32a8c Author: Christopher Tubbs AuthorDate: Wed Apr 17 13:41:31 2019 -0400 Include Guava's failureaccess in assembly (#1097) Include Guava's only runtime dependency in the binary tarball assembly. failureaccess was separated from Guava's main jar and updated to include OSGi stuffs for Android, and is no longer bundled with Guava in 27.1 and later. --- assemble/pom.xml | 5 + assemble/src/main/assemblies/component.xml | 1 + pom.xml| 6 ++ 3 files changed, 12 insertions(+) diff --git a/assemble/pom.xml b/assemble/pom.xml index b113a2f..40f8c50 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -79,6 +79,11 @@ com.google.guava + failureaccess + true + + + com.google.guava guava true diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml index d799ce0..84a7cb2 100644 --- a/assemble/src/main/assemblies/component.xml +++ b/assemble/src/main/assemblies/component.xml @@ -39,6 +39,7 @@ com.fasterxml:classmate com.github.ben-manes.caffeine:caffeine com.google.code.gson:gson +com.google.guava:failureaccess com.google.guava:guava com.google.protobuf:protobuf-java com.sun.xml.bind:jaxb-core diff --git a/pom.xml b/pom.xml index cebb3d7..f792d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -216,6 +216,12 @@ 2.8.5 + +com.google.guava +failureaccess +1.0.1 + + com.google.guava guava 27.1-jre
[accumulo] branch 1.9 updated: Backport #1096 to 1.9 Remove Generated annotations
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 1.9 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/1.9 by this push: new a40b9dc Backport #1096 to 1.9 Remove Generated annotations a40b9dc is described below commit a40b9dcbf6cc7476660f1a3633afd633657367ab Author: Christopher Tubbs AuthorDate: Wed Apr 17 08:09:37 2019 -0400 Backport #1096 to 1.9 Remove Generated annotations Backport of #1096 to the 1.9 branch for 1.9.4. This removes Generated annotations from Thrift-generated code so that the project has fewer build problems with Java 11. --- .../java/org/apache/accumulo/core/client/impl/thrift/ClientService.java | 2 -- .../java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java| 2 -- .../accumulo/core/client/impl/thrift/ThriftSecurityException.java | 2 -- .../accumulo/core/client/impl/thrift/ThriftTableOperationException.java | 2 -- .../java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java| 2 -- .../java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java | 2 -- .../src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java | 2 -- .../src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java | 2 -- .../main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java| 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java | 2 -- .../java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java | 2 -- .../java/org/apache/accumulo/core/data/thrift/TConditionalSession.java | 2 -- .../apache/accumulo/core/data/thrift/TConstraintViolationSummary.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java | 2 -- core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java | 2 -- .../main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java| 2 -- .../main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java | 2 -- core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java | 2 -- core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java | 2 -- .../java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java | 2 -- .../main/java/org/apache/accumulo/core/master/thrift/Compacting.java| 2 -- .../main/java/org/apache/accumulo/core/master/thrift/DeadServer.java| 2 -- .../main/java/org/apache/accumulo/core/master/thrift/FateService.java | 2 -- .../org/apache/accumulo/core/master/thrift/MasterClientService.java | 2 -- .../java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java | 2 -- .../java/org/apache/accumulo/core/master/thrift/RecoveryException.java | 2 -- .../java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java | 2 -- .../src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java | 2 -- .../java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java | 2 -- .../main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java | 2 -- .../java/org/apache/accumulo/core/replication/thrift/KeyValues.java | 2 -- .../accumulo/core/replication/thrift/RemoteReplicationException.java| 2 -- .../apache/accumulo/core/replication/thrift/ReplicationCoordinator.java | 2 -- .../core/replication/thrift/ReplicationCoordinatorException.java| 2 -- .../apache/accumulo/core/replication/thrift/ReplicationServicer.java| 2 -- .../main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java | 2 -- .../org/apache/accumulo/core/security/thrift/TAuthenticationKey.java| 2 -- .../accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java | 2 -- .../java/org/apache/accumulo/core/security/thrift/TCredentials.java | 2 -- .../java/org/apache/accumulo/core/security/thrift/TDelegationToken.java | 2 -- .../apache/accumulo/core/security/thrift/TDelegationTokenConfig.java| 2 -- .../java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java | 2 -- .../org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java | 2 -- .../java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java | 2 -- .../accumulo/core/tabletserver/thrift/ConstraintViolationException.java | 2 -- .../org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java| 2 -- .../apache/accumulo/core/tabletserver/thrift/NoSuchScanIDE
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit d4eb55daf5407679f485b9abef207fd2c76e7d73 Merge: c6e6c7a a40b9dc Author: Christopher Tubbs AuthorDate: Wed Apr 17 08:17:09 2019 -0400 Merge branch '1.9'
[accumulo] branch master updated (c6e6c7a -> d4eb55d)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from c6e6c7a Remove usage of Generated annotation from thrift code. (#1096) new a40b9dc Backport #1096 to 1.9 Remove Generated annotations new d4eb55d Merge branch '1.9' 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:
[accumulo] branch master updated: Remove usage of Generated annotation from thrift code. (#1096)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new c6e6c7a Remove usage of Generated annotation from thrift code. (#1096) c6e6c7a is described below commit c6e6c7ae7ffd9ecd91422210359a9dd05c16e933 Author: Keith Turner AuthorDate: Wed Apr 17 08:05:04 2019 -0400 Remove usage of Generated annotation from thrift code. (#1096) Thrift generated code uses the javax Generated annotation. This annotation was previously included with Java. In Java 11 its no longer present. Removing it from the generated code enables building with Java 8 and Java 11. --- .../java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java | 1 - .../org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java | 1 - .../org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java | 1 - .../java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java | 1 - .../java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java | 1 - .../accumulo/core/clientImpl/thrift/TableOperationExceptionType.java| 1 - .../core/clientImpl/thrift/ThriftNotActiveServiceException.java | 1 - .../apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java | 1 - .../accumulo/core/clientImpl/thrift/ThriftTableOperationException.java | 1 - .../java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java | 1 - .../java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java| 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java | 1 - .../java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java | 1 - .../src/main/java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java | 1 - .../org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java | 1 - .../org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java | 1 - .../accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java | 1 - core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TKey.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java | 1 - core/src/main/java/org/apache/accumulo/core/dataImpl/thrift/TRange.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java | 1 - .../apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java | 1 - .../main/java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java| 1 - .../java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java | 1 - .../java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java | 1 - .../main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java | 1 - core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java | 1 - core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java | 1 - .../java/org/apache/accumulo/core/master/thrift/BulkImportState.java| 1 - .../java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java | 1 - .../main/java/org/apache/accumulo/core/master/thrift/Compacting.java| 1 - .../main/java/org/apache/accumulo/core/master/thrift/DeadServer.java| 1 - .../main/java/org/apache/accumulo/core/master/thrift/FateOperation.java | 1 - .../main/java/org/apache/accumulo/core/master/thrift/FateService.java | 1 - .../org/apache/accumulo/core/master/thrift/MasterClientService.java | 1 - .../java/org/apache/accumulo/core/master/thrift/MasterGoalState.java| 1 - .../java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java | 1 - .../main/java/org/apache/accumulo/core/master/thrift/MasterState.java | 1 - .../java/org/apache/accumulo/core/master/thrift/RecoveryException.java | 1 - .../java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java | 1 - .../src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java | 1 - .../java/org/apache/accumulo/core/master/thrift/TabletLoadState.java| 1 - .../java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java | 1 - .../main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java | 1 - .../java/org/apache/accumu
