Merge branch 'stable'

Bump Gluon to v2017.1.2
2017-08-14 21:36:16 +02:00
parent efbf94b1fc 76e8a5bffd
commit 2c5eb2f2b2
2 changed files with 15 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,23 @@
 # Freifunk München Firmware Changelog

+## v2017.1
+
+ - Updated to Gluon v2017.7
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.7.html
+
 ## v2017.0

 - Updated to Gluon v2016.2.6 (upstream)
   - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.4.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.5.html
-     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.6.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.6.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.1.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.3.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.4.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.5.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.6.html
 - site.mk
   - added GLUON_REGION = eu setting

--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 826ac884936d695252ade6b8b4b27a8383580f5e
+GLUON_GIT_REF := v2017.1.2

 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key