Update changelog.

Changelog.md

@@ -11,18 +11,20 @@ Breaking Changes
 
 New
 
-* Log changes made by the `slurm` unit to updates. ([#87])
-* The `slurm` unit now updates its data set if it discovers that the Slurm
-  files have changed. ([#89])
-* Both the `json` unit and target now support conditional HTTP requests
-  via the Etag and Last-Modified headers. ([#98])
-* The RTR timer values can now be configured for the RTR target. ([#106])
+* Added a new `merge` unit that merges the datasets of all its sources.
+  ([#110])
 * Added four new configuration options to the HTTP client:
   * `http-root-certs` for additional TLS root certificates,
   * `http-user-agent` for setting a custom user agent,
   * `http-client-addr` to specify a local address to bind to, and
   * `http-proxies` to add HTTP proxies (only available if the `socks` feature
      is enabled which it is by default). ([#111])
+* The RTR timer values can now be configured for the RTR target. ([#106])
+* Log changes made by the `slurm` unit to updates. ([#87])
+* The `slurm` unit now updates its data set if it discovers that the Slurm
+  files have changed. ([#89])
+* Both the `json` unit and target now support conditional HTTP requests
+  via the Etag and Last-Modified headers. ([#98])
 
 Bug Fixes
 
@@ -45,6 +47,7 @@ Other Changes
 [#98]: https://github.com/NLnetLabs/rtrtr/pull/98
 [#101]: https://github.com/NLnetLabs/rtrtr/pull/101
 [#106]: https://github.com/NLnetLabs/rtrtr/pull/106
+[#110]: https://github.com/NLnetLabs/rtrtr/pull/110
 [#111]: https://github.com/NLnetLabs/rtrtr/pull/111