From 1b574f64b79ef374873c0b3145754ebae48474b6 Mon Sep 17 00:00:00 2001
From: Jasper den Hertog <jasper@plainspace.com>
Date: Wed, 12 Jun 2024 14:58:02 +0200
Subject: [PATCH 1/2] update Changelog and version

---
 Cargo.toml   |  2 +-
 Changelog.md | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f7babad..cbc56cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ keywords = ["routing", "bgp"]
 license = "BSD-3-Clause"
 name = "rotonda-store"
 repository = "https://github.com/NLnetLabs/rotonda-store/"
-version = "0.4.1-dev"
+version = "0.4.0-rc0"
 rust-version = "1.71"
 
 [dependencies]
diff --git a/Changelog.md b/Changelog.md
index 65f07ee..21b8426 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,17 +1,23 @@
 # Change Log
 
-## Unreleased new version
+## 0.4.0-rc0
 
 Breaking changes
 
+* Removed `MergeUpdate` trait
+
 New
 
+* Leaves now are HashMaps keyed on multi_uniq_ids (`mui`)
+* Facilities for best (and backup) path selection for a prefix
+* Facilities for iterating over and searching for values for (prefix, mui)
+  combinations
+
 Bug fixes
 
 Other changes
 
-* Use inetnum::addr::Prefix, instead of routecore::addr::Prefix
-* Remove routecore dependency
+* Use inetnum structs instead of routecore (Asn, Prefix)
 
 ## 0.3.0
 

From 947cdce9ede23650eea0aecfd810da19b222e32e Mon Sep 17 00:00:00 2001
From: Jasper den Hertog <jasper@plainspace.com>
Date: Wed, 12 Jun 2024 15:01:43 +0200
Subject: [PATCH 2/2] remove IdOrderable

---
 Changelog.md                          |  2 ++
 src/local_array/store/atomic_types.rs | 14 --------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 21b8426..a6e99c1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,8 @@
 
 ## 0.4.0-rc0
 
+Released 2024-06-12.
+
 Breaking changes
 
 * Removed `MergeUpdate` trait
diff --git a/src/local_array/store/atomic_types.rs b/src/local_array/store/atomic_types.rs
index 430a32d..d15d9bd 100644
--- a/src/local_array/store/atomic_types.rs
+++ b/src/local_array/store/atomic_types.rs
@@ -420,20 +420,6 @@ pub struct MultiMap<M: Meta>(
     pub(crate) flurry::HashMap<u32, MultiMapValue<M>>,
 );
 
-pub struct IdOrderable<T>(pub u32, T);
-
-impl<T: PartialOrd + Eq + PartialEq> PartialOrd for IdOrderable<T> {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.1.partial_cmp(&other.1)
-    }
-}
-
-impl<T: PartialOrd + Eq + PartialOrd> PartialEq for IdOrderable<T> {
-    fn eq(&self, other: &Self) -> bool {
-        self.1 == other.1
-    }
-}
-
 impl<M: Send + Sync + Debug + Display + Meta> MultiMap<M> {
     pub(crate) fn new(record_map: HashMap<u32, MultiMapValue<M>>) -> Self {
         Self(record_map)