Merge branch 'cassandra-4.1' into trunk

apache · Jan 10, 2023 · 386bf78 · 386bf78
2 parents baca1dd + da5ec9a
commit 386bf78
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -167,6 +167,7 @@ Merged from 3.11:
  * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759)
  * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
 Merged from 3.0:
+ * Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126)
  * Avoid anticompaction mixing data from two different time windows with TWCS (CASSANDRA-17970)
  * Do not spam the logs with MigrationCoordinator not being able to pull schemas (CASSANDRA-18096)
  * Fix incorrect resource name in LIST PERMISSION output (CASSANDRA-17848)

diff --git a/ide/idea/vcs.xml b/ide/idea/vcs.xml
@@ -3,4 +3,14 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="CASSANDRA-(\d+)" />
+          <option name="linkRegexp" value="https://issues.apache.org/jira/browse/CASSANDRA-$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
 </project>