Move Changes on top of the Changelog

refs #6704

diff --git a/ChangeLog b/ChangeLog
index c83e063dfcce287c8de8c8bdd2a6d0c1d5b8c57b..7b0375112943b2c3f4691fc5e3cf63271fe02458 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,22 @@ Please check doc/1-about.md.
 
 ### What's New in Version 2.1.0
 
+#### Changes
+
+* DB IDO schema upgrade ([MySQL](#upgrading-mysql-db),[PostgreSQL](#upgrading-postgresql-db) required!
+    * new schema version: **1.11.7**
+    * RPMs install the schema files into `/usr/share/icinga2-ido*` instead of `/usr/share/doc/icinga2-ido*` #6881
+* [Information for config objects](#list-configuration-objects) using `icinga2-list-objects` script #6702
+* Add search path: If `-c /etc/icinga2/icinga2.conf` is omitted, use `SysconfDir + "/icinga2/icinga2.conf"` #6874
+* Change log level for failed commands #6751
+* Notifications are load-balanced in a [High Availability cluster setup](#high-availability-notifications) #6203
+    * New config attribute: `enable_ha`
+* DB IDO "run once" or "run everywhere" mode in a [High Availability cluster setup](#high-availability-db-ido) #6203 #6827
+    * New config attributes: `enable_ha` and `failover_timeout`
+* RPMs use the `icingacmd` group for /var/{cache,log,run}/icinga2 #6948
+
+#### Issues
+
 * Bug #6881: make install does not install the db-schema
 * Bug #6915: use _rundir macro for configuring the run directory
 * Bug #6916: External command pipe: Too many open files
@@ -47,20 +63,6 @@ Please check doc/1-about.md.
 * Documentation - Feature #7018: add example selinux policy for external command pipe
 * Plugins - Feature #6650: Plugin Check Commands: add manubulon snmp plugins
 
-#### Changes
-
-* DB IDO schema upgrade ([MySQL](#upgrading-mysql-db),[PostgreSQL](#upgrading-postgresql-db) required!
-    * new schema version: **1.11.7**
-    * RPMs install the schema files into `/usr/share/icinga2-ido*` instead of `/usr/share/doc/icinga2-ido*` #6881
-* [Information for config objects](#list-configuration-objects) using `icinga2-list-objects` script #6702
-* Add search path: If `-c /etc/icinga2/icinga2.conf` is omitted, use `SysconfDir + "/icinga2/icinga2.conf"` #6874
-* Change log level for failed commands #6751
-* Notifications are load-balanced in a [High Availability cluster setup](#high-availability-notifications) #6203
-    * New config attribute: `enable_ha`
-* DB IDO "run once" or "run everywhere" mode in a [High Availability cluster setup](#high-availability-db-ido) #6203 #6827
-    * New config attributes: `enable_ha` and `failover_timeout`
-* RPMs use the `icingacmd` group for /var/{cache,log,run}/icinga2 #6948
-
 
 ### What's New in Version 2.0.2
 

diff --git a/doc/1-about.md b/doc/1-about.md
index 0c1196dbc345f6453b608f226cda95ad2501c51d..6da968a5f777aa798f9106b67ed70289b63b7601 100644 (file)
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -48,6 +48,22 @@ Icinga 2 is available as [Vagrant Demo VM](#vagrant).
 
 ### What's New in Version 2.1.0
 
+#### Changes
+
+* DB IDO schema upgrade ([MySQL](#upgrading-mysql-db),[PostgreSQL](#upgrading-postgresql-db) required!
+    * new schema version: **1.11.7**
+    * RPMs install the schema files into `/usr/share/icinga2-ido*` instead of `/usr/share/doc/icinga2-ido*` #6881
+* [Information for config objects](#list-configuration-objects) using `icinga2-list-objects` script #6702
+* Add search path: If `-c /etc/icinga2/icinga2.conf` is omitted, use `SysconfDir + "/icinga2/icinga2.conf"` #6874
+* Change log level for failed commands #6751
+* Notifications are load-balanced in a [High Availability cluster setup](#high-availability-notifications) #6203
+    * New config attribute: `enable_ha`
+* DB IDO "run once" or "run everywhere" mode in a [High Availability cluster setup](#high-availability-db-ido) #6203 #6827
+    * New config attributes: `enable_ha` and `failover_timeout`
+* RPMs use the `icingacmd` group for /var/{cache,log,run}/icinga2 #6948
+
+#### Issues
+
 * Bug #6881: make install does not install the db-schema
 * Bug #6915: use _rundir macro for configuring the run directory
 * Bug #6916: External command pipe: Too many open files
@@ -88,20 +104,6 @@ Icinga 2 is available as [Vagrant Demo VM](#vagrant).
 * Documentation - Feature #6997: how to add a new cluster node
 * Documentation - Feature #7018: add example selinux policy for external command pipe
 
-#### Changes
-
-* DB IDO schema upgrade ([MySQL](#upgrading-mysql-db),[PostgreSQL](#upgrading-postgresql-db) required!
-    * new schema version: **1.11.7**
-    * RPMs install the schema files into `/usr/share/icinga2-ido*` instead of `/usr/share/doc/icinga2-ido*` #6881
-* [Information for config objects](#list-configuration-objects) using `icinga2-list-objects` script #6702
-* Add search path: If `-c /etc/icinga2/icinga2.conf` is omitted, use `SysconfDir + "/icinga2/icinga2.conf"` #6874
-* Change log level for failed commands #6751
-* Notifications are load-balanced in a [High Availability cluster setup](#high-availability-notifications) #6203
-    * New config attribute: `enable_ha`
-* DB IDO "run once" or "run everywhere" mode in a [High Availability cluster setup](#high-availability-db-ido) #6203 #6827
-    * New config attributes: `enable_ha` and `failover_timeout`
-* RPMs use the `icingacmd` group for /var/{cache,log,run}/icinga2 #6948
-
 
 ### Archive