Merge remote-tracking branch 'upstream/2.x' into backport-1964-to-2.x

DarshitChanpura · Jun 3, 2024 · d4e2adf · d4e2adf
2 parents 3f627a9 + 941bff7
commit d4e2adf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "securityDashboards",
-  "version": "2.14.0.0",
-  "opensearchDashboardsVersion": "2.14.0",
+  "version": "2.15.0.0",
+  "opensearchDashboardsVersion": "2.15.0",
   "configPath": [
     "opensearch_security"
   ],

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "opensearch-security-dashboards",
-  "version": "2.14.0.0",
+  "version": "2.15.0.0",
   "main": "target/plugins/opensearch_security_dashboards",
   "opensearchDashboards": {
-    "version": "2.14.0",
-    "templateVersion": "2.14.0"
+    "version": "2.15.0",
+    "templateVersion": "2.15.0"
   },
   "license": "Apache-2.0",
   "homepage": "https://github.com/opensearch-project/security-dashboards-plugin",

diff --git a/release-notes/opensearch-security-dashboards-plugin.release-notes-1.3.17.0.md b/release-notes/opensearch-security-dashboards-plugin.release-notes-1.3.17.0.md
@@ -0,0 +1,7 @@
+## Version 1.3.17.0
+
+Compatible with Opensearch-Dashboards 1.3.17
+
+### Maintenance
+
+* Update security reachout email ([#1948](https://github.com/opensearch-project/security-dashboards-plugin/pull/1948))