Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main into develop #4721

Merged
merged 6 commits into from
Aug 6, 2023
Merged

Merge main into develop #4721

merged 6 commits into from
Aug 6, 2023

Commits on Aug 5, 2023

  1. GH-4711 ParallelTaskBase waits for up to 100ms for the underlying tas… 

    …k to finish after it was cancelled and interrupted
    @hmottestad
    hmottestad committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    2c43e93 View commit details
    Browse the repository at this point in the history

  2. GH-4711 improve interruption handling and improve closing of iterations

    @hmottestad
    hmottestad committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    ab04ad7 View commit details
    Browse the repository at this point in the history

  3. GH-4711 Improve chances that iterations are closed on time in FedX (#… 

    …4713)
    @hmottestad
    hmottestad authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    5abd412 View commit details
    Browse the repository at this point in the history

  4. GH-4714 be more defensive in case a bug results in value being null e… 

    …ven though it was expected
    @hmottestad
    hmottestad committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    c826032 View commit details
    Browse the repository at this point in the history

  5. GH-4714 be more defensive in case a bug results in value being null (#… 

    …4716)
    @hmottestad
    hmottestad authored Aug 5, 2023
    Configuration menu
    Copy the full SHA
    c689a0c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Merge branch 'main' into merge-main-2 

    # Conflicts:
#	core/common/iterator/src/main/java/org/eclipse/rdf4j/common/iteration/Iterations.java
#	tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/concurrent/ParallelServiceExecutor.java
    @hmottestad
    hmottestad committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    aea9da5 View commit details
    Browse the repository at this point in the history