krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Updatet to gluon 2016.2.6

Browse Source
This commit is contained in:
Franz Pletz
2017-06-10 21:32:44 +02:00
parent ba8ff00a73
commit 386547f105
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -4,7 +4,7 @@
UNRELEASED UNRELEASED
- Updated to Gluon v2016.2.4 (upstream) - Updated to Gluon v2016.2.6 (upstream)
- Changes: - Changes:
- https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html - 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.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.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.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.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 - site.mk
- added GLUON_REGION = eu setting - added GLUON_REGION = eu setting

2
Makefile
View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git 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 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key