From 207d9b9ff939966e1c3ab777a2d345c13540cae0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 10 Jun 2017 21:32:44 +0200 Subject: [PATCH] Updatet to gluon 2016.2.6 --- CHANGELOG.md | 4 +++- Makefile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1932f17..621654c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ UNRELEASED - - Updated to Gluon v2016.2.4 (upstream) + - 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 @@ -12,6 +12,8 @@ UNRELEASED - 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 - site.mk - added GLUON_REGION = eu setting diff --git a/Makefile b/Makefile index 9303ab2..15e1a24 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := d452a7c2cf1c0da4e034666a50dc0e7aa9ddc592 +GLUON_GIT_REF := v2016.2.6 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key