From 88dff7e275f18a2c517c11fe54ca59b05e2c37a6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 20 Oct 2014 20:59:10 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/rn-2014.3.1'

Conflicts:
	docs/index.rst
---
 docs/index.rst              |  1 +
 docs/releases/v2014.3.1.rst | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 docs/releases/v2014.3.1.rst

diff --git a/docs/index.rst b/docs/index.rst
index cd6092ea8..0e67c4694 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -78,6 +78,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   releases/v2014.3.1
    releases/v2014.3
 
 
diff --git a/docs/releases/v2014.3.1.rst b/docs/releases/v2014.3.1.rst
new file mode 100644
index 000000000..4a662d917
--- /dev/null
+++ b/docs/releases/v2014.3.1.rst
@@ -0,0 +1,40 @@
+Gluon 2014.3.1
+==============
+
+This is a bugfix release.
+
+Bugfixes
+~~~~~~~~
+
+* gluon-announced zombie process bug
+
+  gluon-announced was creating zombie processes when answering requests, causing issues
+  with the new status page which is currently in development.
+
+* fastd peers removed from ``site.conf`` weren't removed correctly from the fastd configuration
+  on firmware upgrades
+* Expert Mode: setting a password will not remove SSH keys anymore
+* alfred has been updated to 2014.3.0
+
+  We hope this solves the alfred stability issues noted by several people.
+
+* ``gluon-ebtables-filter-ra-dhcp`` and ``gluon-ebtables-filter-multicast`` have been fixed
+  to allow DHCPv6 to work
+
+* Another ath9k patch has been added, which might further improve WLAN stability and performance
+
+New features
+~~~~~~~~~~~~
+
+* Support for static WAN setups instead of (DHCP/Router Advertisement) has been added;
+  configuration is possible on the port config page of the Expert Mode.
+
+Site changes
+~~~~~~~~~~~~
+
+* ``site.conf``
+
+  - The new boolean option ``fastd_mesh_vpn.enabled`` allows
+    enabling the mesh VPN by default. This value is optional;
+    if it isn't specified, the mesh VPN will be disabled.
+
-- 
GitLab