From 676028e8aa599c0962326764584a4882680b1bbe Mon Sep 17 00:00:00 2001 From: Johann Wagner Date: Fri, 27 Jul 2018 20:12:26 +0200 Subject: [PATCH 1/2] Excluded CHANGELOG.md from README.md --- .gitignore | 1 + CHANGELOG.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 60 ++------------------------------------------------- 3 files changed, 64 insertions(+), 58 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.gitignore b/.gitignore index b72f9be..a2ca4c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ *.swp +*.html diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..dbec268 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,61 @@ + +Changelog +--------- +* 0.39: *gluon 2016.2.7* + * Added [ffmd-packages](https://github.com/FreifunkMD/ffmd-packages) repository to the packages repository. This allows easy integration of custom packages. +* 0.38: *gluon 2016.2.7* + * see https://gluon.readthedocs.io/en/v2016.1.6/releases/v2016.1.6.html + * see https://gluon.readthedocs.io/en/v2016.2/releases/v2016.2.html + * see https://gluon.readthedocs.io/en/v2016.2.1/releases/v2016.2.1.html + * see https://gluon.readthedocs.io/en/v2016.2.2/releases/v2016.2.2.html + * see https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html + * see https://gluon.readthedocs.io/en/v2016.2.4/releases/v2016.2.4.html + * see https://gluon.readthedocs.io/en/v2016.2.5/releases/v2016.2.5.html + * see https://gluon.readthedocs.io/en/v2016.2.6/releases/v2016.2.6.html + * see https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html + * Added option for multithreading to build.sh + * Added signing keys for Stefan Haun, Johann Wagner, and Franz Kuntke + * Removed signing keys of Andreas, and Bastinat0r +* 0.37: *gluon 2016.1.5* + * see https://gluon.readthedocs.io/en/v2016.1.5/releases/v2016.1.5.html +* 0.36: *gluon 2016.1.4* + * see + * http://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html + * http://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html + * http://gluon.readthedocs.org/en/v2016.1.4/releases/v2016.1.4.html +* 0.35: *gluon 2016.1.1* + * see http://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html +* 0.34: *gluon 2016.1* + * see http://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html + * firmware build script: add option -d for dirclean +* 0.33: *gluon 2015.1.2* + * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html +* 0.32: *gluon 2015.1.1* + * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.html and http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.1.html + * reduced stable branch update priority from two weeks to one + * enhanced version scheme for beta and experimental versions + * improved Freifunk Magdeburg build script +* 0.31: *gluon 2014.4* + * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2014.4.html + * enabled `gluon-neighbour-info` + * make IPv6 connections to gateways possible and add optional addresses + * changed fastd auth method from gmac to umac + * allow to configure a private WLAN which is bridged with the WAN uplink +* 0.30: *gluon 2014.3.1* + * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2014.3.1.html + * enable mesh VPN by default + * set ffmd internal ntp servers actually reachable from nodes +* 0.29: *gluon 2014.3* + * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2014.3.html + * fix #31 (autoupdate per default anschalten) +* 0.28: *gluon 2014.2* + * **note** first version with specific gluon version, previous were + simply built from arbitrary master states + * new build script to enable the above + * added package gluon-firewall + * replaced FFHL auto-update keys by FFMD keys + * changed auto-update URLs for later use +* 0.27 + * added link to the registerseite +* 0.26 + * first ffmd gluon version diff --git a/README.md b/README.md index e911f07..221529a 100644 --- a/README.md +++ b/README.md @@ -69,61 +69,5 @@ Verify a successful upgrade by Changelog --------- -* 0.39: *gluon 2016.2.7* - * Added [ffmd-packages](https://github.com/FreifunkMD/ffmd-packages) repository to the packages repository. This allows easy integration of custom packages. -* 0.38: *gluon 2016.2.7* - * see https://gluon.readthedocs.io/en/v2016.1.6/releases/v2016.1.6.html - * see https://gluon.readthedocs.io/en/v2016.2/releases/v2016.2.html - * see https://gluon.readthedocs.io/en/v2016.2.1/releases/v2016.2.1.html - * see https://gluon.readthedocs.io/en/v2016.2.2/releases/v2016.2.2.html - * see https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html - * see https://gluon.readthedocs.io/en/v2016.2.4/releases/v2016.2.4.html - * see https://gluon.readthedocs.io/en/v2016.2.5/releases/v2016.2.5.html - * see https://gluon.readthedocs.io/en/v2016.2.6/releases/v2016.2.6.html - * see https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html - * Added option for multithreading to build.sh - * Added signing keys for Stefan Haun, Johann Wagner, and Franz Kuntke - * Removed signing keys of Andreas, and Bastinat0r -* 0.37: *gluon 2016.1.5* - * see https://gluon.readthedocs.io/en/v2016.1.5/releases/v2016.1.5.html -* 0.36: *gluon 2016.1.4* - * see - * http://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html - * http://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html - * http://gluon.readthedocs.org/en/v2016.1.4/releases/v2016.1.4.html -* 0.35: *gluon 2016.1.1* - * see http://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html -* 0.34: *gluon 2016.1* - * see http://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html - * firmware build script: add option -d for dirclean -* 0.33: *gluon 2015.1.2* - * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html -* 0.32: *gluon 2015.1.1* - * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.html and http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.1.html - * reduced stable branch update priority from two weeks to one - * enhanced version scheme for beta and experimental versions - * improved Freifunk Magdeburg build script -* 0.31: *gluon 2014.4* - * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2014.4.html - * enabled `gluon-neighbour-info` - * make IPv6 connections to gateways possible and add optional addresses - * changed fastd auth method from gmac to umac - * allow to configure a private WLAN which is bridged with the WAN uplink -* 0.30: *gluon 2014.3.1* - * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2014.3.1.html - * enable mesh VPN by default - * set ffmd internal ntp servers actually reachable from nodes -* 0.29: *gluon 2014.3* - * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2014.3.html - * fix #31 (autoupdate per default anschalten) -* 0.28: *gluon 2014.2* - * **note** first version with specific gluon version, previous were - simply built from arbitrary master states - * new build script to enable the above - * added package gluon-firewall - * replaced FFHL auto-update keys by FFMD keys - * changed auto-update URLs for later use -* 0.27 - * added link to the registerseite -* 0.26 - * first ffmd gluon version + +We excluded the [CHANGELOG](CHANGELOG.md) into another file to prepare automation. From 2b88bbcd3bea1c59c0563caf0dc50a510d3d896e Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 10 Aug 2018 23:01:11 +0200 Subject: [PATCH 2/2] Change reference to changelog file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 221529a..95e1082 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,4 @@ Verify a successful upgrade by Changelog --------- -We excluded the [CHANGELOG](CHANGELOG.md) into another file to prepare automation. +The changelog can be found in [CHANGELOG.md](CHANGELOG.md).