From 1e04935673179e4817319aa9ef6da7aa9cdcf6e9 Mon Sep 17 00:00:00 2001 From: Kunal Kotwani Date: Wed, 29 Mar 2023 14:36:54 -0700 Subject: [PATCH] Fix changelog divergence for 2.x on main Signed-off-by: Kunal Kotwani --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fc6167f8cca4..5e4d984cadbbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,9 +38,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `com.maxmind.geoip2:geoip2` from 4.0.0 to 4.0.1 - Bump `com.networknt:json-schema-validator` from 1.0.76 to 1.0.78 - Bump `com.netflix.nebula:gradle-info-plugin` from 12.0.0 to 12.0.1 -- Bump `org.apache.zookeeper:zookeeper` from 3.8.0 to 3.8.1 -- Bump `net.minidev:json-smart` from 2.4.8 to 2.4.10 -- Bump `org.apache.maven:maven-model` from 3.8.6 to 3.9.1 ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) @@ -101,6 +98,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `com.google.protobuf:protobuf-java` from 3.22.0 to 3.22.2 - Bump Netty to 4.1.90.Final ([#6677](https://github.com/opensearch-project/OpenSearch/pull/6677) - Bump `com.diffplug.spotless` from 6.15.0 to 6.17.0 +- Bump `org.apache.zookeeper:zookeeper` from 3.8.0 to 3.8.1 +- Bump `net.minidev:json-smart` from 2.4.7 to 2.4.10 +- Bump `org.apache.maven:maven-model` from 3.6.2 to 3.9.1 - Bump `org.codehaus.jettison:jettison` from 1.5.3 to 1.5.4 ([#6878](https://github.com/opensearch-project/OpenSearch/pull/6878)) ### Changed