Merge branch 'master' into TOOLS-2936

aerospike · Jul 17, 2024 · 4382b14 · 4382b14
2 parents b76011f + 95985cd
commit 4382b14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml
@@ -56,7 +56,7 @@ jobs:
         cond: ${{ inputs.submodule != '' }}
         if_true: aerospike-tools/${{ inputs.submodule }}  # In this case we are expecting to checkout the tools package.
         if_false: asbackup
-    - uses: kenchan0130/actions-system-info@master
+    - uses: kenchan0130/actions-system-info@v1.3.0
       id: system-info
     - name: install libuv
       id: install-libuv
@@ -250,7 +250,7 @@ jobs:
     if: "${{ inputs.submodule == '' }}"
 
     steps: 
-      - uses: kenchan0130/actions-system-info@master
+      - uses: kenchan0130/actions-system-info@v1.3.0
         id: system-info
       - name: Get artifacts
         uses: actions/download-artifact@v2

diff --git a/modules/c-client b/modules/c-client
+2 −2		examples/utils/src/main/example_utils.c
+1 −1		modules/common
+ −		src/apidocs/html/aerospike_logo.png
+2 −2		src/include/aerospike/as_event.h
+5 −5		src/include/aerospike/as_policy.h
+1 −1		src/include/aerospike/version.h
+1 −1		src/main/aerospike/aerospike_query.c
+1 −4		src/main/aerospike/aerospike_scan.c
+1 −1		src/main/aerospike/as_async.c
+3 −3		src/main/aerospike/as_event.c
+2 −2		src/main/aerospike/as_metrics_writer.c
+2 −2		src/main/aerospike/as_pipe.c
+2 −2		src/main/aerospike/as_shm_cluster.c
+5 −5		src/main/aerospike/as_socket.c
+4 −4		src/main/aerospike/as_tls.c
+2 −2		src/main/aerospike/as_udf.c
+1 −1		src/main/aerospike/version.c
+1 −1		vs/aerospike-client-c-libevent.nuspec
+1 −1		vs/aerospike-client-c-libuv.nuspec
+1 −1		vs/aerospike-client-c.nuspec