From f4e430d6c6d75c853e92b5eb26e0545d3b2007e0 Mon Sep 17 00:00:00 2001
From: Jake Smith <jake.smith@lexisnexisrisk.com>
Date: Mon, 11 Nov 2024 17:29:26 +0000
Subject: [PATCH 1/2] Split off 9.8.38

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
---
 helm/hpcc/Chart.yaml             | 4 ++--
 helm/hpcc/templates/_helpers.tpl | 2 +-
 version.cmake                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index 7f5dff55460..d9957af1ad7 100644
--- a/helm/hpcc/Chart.yaml
+++ b/helm/hpcc/Chart.yaml
@@ -6,9 +6,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 9.8.37-closedown0
+version: 9.8.39-closedown0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 
-appVersion: 9.8.37-closedown0
+appVersion: 9.8.39-closedown0
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index e033bc4db19..0f3678b1338 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1477,7 +1477,7 @@ Pass in dict with .root, .visibility defined
 {{- end -}}
 
 {{- define "hpcc.generateHelmVersion" -}}
-helmVersion: 9.8.37-closedown0
+helmVersion: 9.8.39-closedown0
 {{- end -}}
 
 {{/*
diff --git a/version.cmake b/version.cmake
index 82b3a40254e..9e1f09732fe 100644
--- a/version.cmake
+++ b/version.cmake
@@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" )
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 9 )
 set ( HPCC_MINOR 8 )
-set ( HPCC_POINT 37 )
+set ( HPCC_POINT 39 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-11-01T16:23:03Z" )
+set ( HPCC_TAG_TIMESTAMP "2024-11-11T17:29:26Z" )
 ###

From 5bf7c4f782a877ec2250b4e4e83d847f334fe8e5 Mon Sep 17 00:00:00 2001
From: Gordon Smith <GordonJSmith@gmail.com>
Date: Tue, 12 Nov 2024 10:24:24 +0000
Subject: [PATCH 2/2] HPCC-32979 ECL Watch language file upmerge conflict

Add back missing entries

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
---
 esp/src/src/nls/hpcc.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esp/src/src/nls/hpcc.ts b/esp/src/src/nls/hpcc.ts
index d56b0690175..225842d3b9a 100644
--- a/esp/src/src/nls/hpcc.ts
+++ b/esp/src/src/nls/hpcc.ts
@@ -156,6 +156,7 @@ export = {
         CookiesNoticeLinkText: "Our Cookie Notice",
         CookiesAcceptButtonText: "Allow Cookies",
         Copy: "Copy",
+        CopyOpenTelemetry: "Copy Open Telemetry",
         CopyToClipboard: "Copy to clipboard",
         CopyURLToClipboard: "Copy URL to clipboard",
         CopyWUID: "Copy WUID",
@@ -909,6 +910,7 @@ export = {
         SourceLogicalFile: "Source Logical Name",
         SourcePath: "Source Path (Wildcard Enabled)",
         SourceProcess: "Source Process",
+        Span: "Span",
         SparkThor: "SparkThor",
         Spill: "Spill",
         SplitPrefix: "Split Prefix",
@@ -1073,12 +1075,14 @@ export = {
         TotalSize: "Total Size",
         TotalClusterTime: "Total Cluster Time",
         ToTime: "To Time",
+        Trace: "Trace",
         TransferRate: "Transfer Rate",
         TransferRateAvg: "Transfer Rate (Avg)",
         TransitionGuide: "Transition Guide",
         Text: "Text",
         Tree: "Tree",
         Type: "Type",
+        UnavailableInContainerized: "This is unavailable in a containerized environment.",
         Unbound: "unbound",
         undefined: "undefined",
         Unknown: "Unknown",