From 0122f6b7e9f29704081c4ee9ed46b79291a9aed7 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Thu, 21 Apr 2016 18:27:21 +0200 Subject: [PATCH] upgraded to gluon v2016.1.3 (on ffmuc fork) --- CHANGELOG.md | 3 ++- Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddff172..fa38ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Freifunk München Firmware Changelog ## v2016.1 (not released yet) - - Updated to Gluon v2016.1.2 (ffmuc fork) + - Updated to Gluon v2016.1.3 (ffmuc fork) - Changes: - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html - https://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html - https://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html + - https://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4) - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7) - site.conf diff --git a/Makefile b/Makefile index 33240e1..b438417 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git -GLUON_GIT_REF := 6b609b78224e62a6c198c8af9bd19b4276040cb1 +GLUON_GIT_REF := 8551a1d8cb43ced225d7111422cf5808eee38f2d SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key