From 36c40a743788d45516b33beabc6f10b379f4de51 Mon Sep 17 00:00:00 2001
From: Brian Nichols <bnichols@aerospike.com>
Date: Fri, 16 Aug 2024 13:21:46 -0400
Subject: [PATCH 1/2] CLIENT-3081 Upgrade grpc version to 1.65.1 for the proxy
 client.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 03d679aaf..3fe926122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <netty.version>4.1.111.Final</netty.version>
     <netty.tcnative.version>2.0.62.Final</netty.tcnative.version>
-    <grpc.version>1.59.0</grpc.version>
+    <grpc.version>1.65.1</grpc.version>
     <luaj-jse.version>3.0.1</luaj-jse.version>
     <jbcrypt.version>0.4</jbcrypt.version>
     <commons-cli.version>1.8.0</commons-cli.version>

From 9b9aee95c11e43454e217f55b98949beb5f6a5f6 Mon Sep 17 00:00:00 2001
From: Brian Nichols <bnichols@aerospike.com>
Date: Tue, 27 Aug 2024 11:36:47 -0400
Subject: [PATCH 2/2] CLIENT-3097 Add XDR_KEY_BUSY result code.

---
 client/src/com/aerospike/client/ResultCode.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/src/com/aerospike/client/ResultCode.java b/client/src/com/aerospike/client/ResultCode.java
index cdf1d8341..54a3ce096 100644
--- a/client/src/com/aerospike/client/ResultCode.java
+++ b/client/src/com/aerospike/client/ResultCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 Aerospike, Inc.
+ * Copyright 2012-2024 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
@@ -233,6 +233,11 @@ public final class ResultCode {
 	 */
 	public static final int LOST_CONFLICT = 28;
 
+	/**
+	 * Write can't complete until XDR finishes shipping.
+	 */
+	public static final int XDR_KEY_BUSY = 32;
+
 	/**
 	 * There are no more records left for query.
 	 */
@@ -582,6 +587,9 @@ public static String getResultString(int resultCode) {
 		case LOST_CONFLICT:
 			return "Transaction failed due to conflict with XDR";
 
+		case XDR_KEY_BUSY:
+			return "Write can't complete until XDR finishes shipping";
+			
 		case QUERY_END:
 			return "Query end";