From d9a04596283908d1cd19d7b9c18d298f79e78a05 Mon Sep 17 00:00:00 2001 From: Long Ma Date: Thu, 16 Feb 2023 11:56:54 -0700 Subject: [PATCH] fix mergeback missed items --- hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java | 1 + .../main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/upgrade.md | 2 ++ .../resources/ca/uhn/hapi/fhir/changelog/6_2_6/version.yaml | 3 +++ .../6_4_0/4416-add-contention-aware-patch-in-transaction.yaml | 1 + 4 files changed, 7 insertions(+) create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/upgrade.md create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/version.yaml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java index f7913877e1e..53cbfed25cf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java @@ -111,6 +111,7 @@ public enum VersionEnum { V6_2_3, V6_2_4, V6_2_5, + V6_2_6, // Dev Build V6_3_0, V6_4_0, diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/upgrade.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/upgrade.md new file mode 100644 index 00000000000..324b0eace0f --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/upgrade.md @@ -0,0 +1,2 @@ + +This release fixes a problem with the batch framework which could cause jobs to hang indefinitely if multiple processes attempted to run a maintenance pass simultaneously. diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/version.yaml new file mode 100644 index 00000000000..cca4039b9ea --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_6/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2023-02-07" +codename: "Vishwa" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_0/4416-add-contention-aware-patch-in-transaction.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_0/4416-add-contention-aware-patch-in-transaction.yaml index 1cc0d2b8a39..da79bb74519 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_0/4416-add-contention-aware-patch-in-transaction.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_0/4416-add-contention-aware-patch-in-transaction.yaml @@ -1,6 +1,7 @@ --- type: add issue: 4416 +backport: 6.2.6 title: "The JPA server now supports contention aware patch operations (i.e. using `If-Match`) within a FHIR Transaction. Previously the `Bundle.entry.request.ifMatch` element was incorrectly treated as a conditional URL and not a version tag."