Merge remote-tracking branch 'origin/dev' into CLIENT-2992-python-3.13

aerospike · Nov 20, 2024 · f880d4b · f880d4b
2 parents 5b0150b + a46024d
commit f880d4b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/aerospike-client-c b/aerospike-client-c
diff --git a/src/main/exception.c b/src/main/exception.c
@@ -109,8 +109,6 @@ struct exception_def exception_defs[] = {
                   AEROSPIKE_ERR_ASYNC_CONNECTION, NULL),
     EXCEPTION_DEF("ClientAbortError", CLIENT_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_CLIENT_ABORT, NULL),
-    EXCEPTION_DEF("RollAlreadyAttempted", CLIENT_ERR_EXCEPTION_NAME,
-                  AEROSPIKE_ROLL_ALREADY_ATTEMPTED, NULL),
     // Server errors
     EXCEPTION_DEF("InvalidRequest", SERVER_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_REQUEST_INVALID, NULL),
+16 −21		src/include/aerospike/as_status.h
+6 −0		src/include/aerospike/as_txn.h
+14 −2		src/main/aerospike/aerospike_batch.c
+12 −0		src/main/aerospike/aerospike_key.c
+3 −4		src/main/aerospike/as_error.c
+10 −0		src/main/aerospike/as_txn.c
+2 −2		src/test/transaction_async.c