Sy/porting to master2 (#18530)

* [Release] Bumped cisco_aci version to 2.12.0 * conflict * Update hazelcast/CHANGELOG.md Co-authored-by: Austin Lai <76412946+alai97@users.noreply.github.com> * Update cisco_aci/CHANGELOG.md Co-authored-by: Austin Lai <76412946+alai97@users.noreply.github.com> --------- Co-authored-by: Austin Lai <76412946+alai97@users.noreply.github.com>
DataDog · Sep 27, 2024 · fcbaaa1 · fcbaaa1
1 parent 704e42d
commit fcbaaa1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/cisco_aci/CHANGELOG.md b/cisco_aci/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 2.12.0 / 2024-09-06
+
+***Added***:
+
+* Add the ability to tag Cisco ACI device and interface metrics with user-defined tags. ([#18496](https://github.com/DataDog/integrations-core/pull/18496))
+
 ## 2.11.0 / 2024-09-05
 
 ***Added***:

diff --git a/cisco_aci/changelog.d/18496.added b/cisco_aci/changelog.d/18496.added
diff --git a/cisco_aci/datadog_checks/cisco_aci/__about__.py b/cisco_aci/datadog_checks/cisco_aci/__about__.py
@@ -2,4 +2,4 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
-__version__ = "2.11.0"
+__version__ = "2.12.0"
diff --git a/hazelcast/CHANGELOG.md b/hazelcast/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 4.1.0 / 2024-09-06
+
+***Added***:
+
+* Bump hazalcast-python-client version for Python 3.12 support ([#18520](https://github.com/DataDog/integrations-core/pull/18520))
+
 ## 4.0.0 / 2024-09-05
 
 ***Changed***:

diff --git a/hazelcast/changelog.d/18520.added b/hazelcast/changelog.d/18520.added
diff --git a/hazelcast/datadog_checks/hazelcast/__about__.py b/hazelcast/datadog_checks/hazelcast/__about__.py
@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2020-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = '4.0.0'
+__version__ = '4.1.0'
diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt
@@ -30,7 +30,7 @@ datadog-checks-base==37.0.0
 datadog-checks-dependency-provider==1.4.0
 datadog-checks-downloader==4.7.0
 datadog-cilium==3.6.0
-datadog-cisco-aci==2.11.0
+datadog-cisco-aci==2.12.0
 datadog-cisco-secure-firewall==1.0.0
 datadog-citrix-hypervisor==3.2.1
 datadog-clickhouse==3.7.0
@@ -71,7 +71,7 @@ datadog-go-expvar==2.5.1
 datadog-gunicorn==2.8.0; sys_platform != 'win32'
 datadog-haproxy==5.2.2
 datadog-harbor==3.2.2
-datadog-hazelcast==4.0.0
+datadog-hazelcast==4.1.0
 datadog-hdfs-datanode==4.2.1; sys_platform != 'win32'
 datadog-hdfs-namenode==4.2.1; sys_platform != 'win32'
 datadog-hive==1.10.0