Skip to content

Commit

Permalink
Task/merge 5.2 to 5.8 (#2062)
Browse files Browse the repository at this point in the history
* Closes #1961 - Use MoreExecutors.newDirectExecutorService() for ListenableFuture callbacks (#1962)

* Closes #1963 - Bump ZK to 3.8.1 (#1965)

* 5.2.1

* 5.2.2-SNAPSHOT

* Date volume chooser (#1347) (#1948)

* Date volume chooser (#1347)

* First pass at date based volume chooser

* Moved to balancers package and renamed package

* Adding missed rename

* Update dist.xml to reflect new package name

* Updates for quickstart and docs to point to new jar

* Updates for accumulo 2.1

* Some minor cleanup

* Updating tests

* Update date chooser with comments.

* Updates for date based volume chooser

---------

Co-authored-by: Adam Lerman awlerma <awlerma@uwe.nsa.gov>
Co-authored-by: Adam Lerman <adamlerman@Adams-MacBook-Pro.local>

* 5.2.2

* 5.2.3-SNAPSHOT

* Updated to avoid using a separate a listener executor that requires being shutdown (#1980)

* 5.2.3

* 5.2.4-SNAPSHOT

* Update query limits handling to allow rules based on systemFrom values (#1951)

* 5.2.4

* 5.2.5-SNAPSHOT

* Merge release/version3.41 into release/version5.2 (#2033)

* 5.2.5

* 5.2.6-SNAPSHOT

* Fixes #2039 (#2040)

* Fixes #2039
- Restored ability to configure AccumuloOutputFormat's accumulo client via script
- Cleanup of IngestJob's CBMutationOutputFormatter setup for live ingest

* RE: #2039 - Ensure that parent class configure method is used

* 5.2.6

* 5.2.7-SNAPSHOT

* Fix formatting for AccumuloHelper

* ThreadConfigurableLogger not suppressing logs in query metric writing (#2023) (#2024)

Conflicts:
	web-services/common-util/src/main/java/datawave/webservice/common/logging/ThreadConfigurableLogger.java

* 5.2.7

* 5.2.8-SNAPSHOT

* Pass query parameters to remoteQueryService.planQuery call (#2043)

* Previously, no parameters were passed. This meant the receiver did not get any information about the query to plan, resulting in an odd `415 Unsupported Media Type` error due to the empty POST body.
Conflicts:
	warehouse/query-core/src/main/java/datawave/query/tables/RemoteEventQueryLogic.java

* 5.2.8

* 5.2.9-SNAPSHOT

* Correct merge conflicts

---------

Co-authored-by: Keith Ratcliffe <ratcliffe.keith@gmail.com>
Co-authored-by: alerman <alerman@gmail.com>
Co-authored-by: Adam Lerman awlerma <awlerma@uwe.nsa.gov>
Co-authored-by: Adam Lerman <adamlerman@Adams-MacBook-Pro.local>
Co-authored-by: Ivan Bella <ivan@bella.name>
Co-authored-by: Drew Farris <drew.farris@gmail.com>
Co-authored-by: Bill Oley <bill.oley@gmail.com>
  • Loading branch information
8 people committed Aug 8, 2023
1 parent 5d6165d commit b253805
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b253805

Please sign in to comment.