diff --git a/CHANGES.txt b/CHANGES.txt index 2b7530fe75..fc643adf16 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.3 + * Update metrics to 3.1.5 (CASSANDRA-12924) * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) diff --git a/build.xml b/build.xml index 9d25d6b9b7..f8cdf827c0 100644 --- a/build.xml +++ b/build.xml @@ -427,8 +427,8 @@ - - + + diff --git a/lib/licenses/metrics-core-3.1.0.txt b/lib/licenses/metrics-core-3.1.5.txt similarity index 100% rename from lib/licenses/metrics-core-3.1.0.txt rename to lib/licenses/metrics-core-3.1.5.txt diff --git a/lib/licenses/metrics-jvm-3.1.0.txt b/lib/licenses/metrics-jvm-3.1.5.txt similarity index 100% rename from lib/licenses/metrics-jvm-3.1.0.txt rename to lib/licenses/metrics-jvm-3.1.5.txt diff --git a/lib/licenses/metrics-logback-3.1.0.txt b/lib/licenses/metrics-logback-3.1.5.txt similarity index 100% rename from lib/licenses/metrics-logback-3.1.0.txt rename to lib/licenses/metrics-logback-3.1.5.txt diff --git a/lib/metrics-core-3.1.0.jar b/lib/metrics-core-3.1.0.jar deleted file mode 100644 index 564ffb778e..0000000000 Binary files a/lib/metrics-core-3.1.0.jar and /dev/null differ diff --git a/lib/metrics-core-3.1.5.jar b/lib/metrics-core-3.1.5.jar new file mode 100644 index 0000000000..5e6aed8dda Binary files /dev/null and b/lib/metrics-core-3.1.5.jar differ diff --git a/lib/metrics-jvm-3.1.0.jar b/lib/metrics-jvm-3.1.5.jar similarity index 64% rename from lib/metrics-jvm-3.1.0.jar rename to lib/metrics-jvm-3.1.5.jar index 1e941f8360..9fa80302d6 100644 Binary files a/lib/metrics-jvm-3.1.0.jar and b/lib/metrics-jvm-3.1.5.jar differ diff --git a/lib/metrics-logback-3.1.0.jar b/lib/metrics-logback-3.1.0.jar deleted file mode 100644 index ce0bfbebc8..0000000000 Binary files a/lib/metrics-logback-3.1.0.jar and /dev/null differ diff --git a/lib/metrics-logback-3.1.5.jar b/lib/metrics-logback-3.1.5.jar new file mode 100644 index 0000000000..25ac7a95c1 Binary files /dev/null and b/lib/metrics-logback-3.1.5.jar differ