From 300816ffa1e071f3cb5f19555e66c2a66530bb6b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 3 Sep 2014 19:39:45 +0100
Subject: [PATCH 1/2] Bump versions. Update change logs.

---
 CHANGES.rst         | 17 +++++++++++++++++
 VERSION             |  2 +-
 synapse/__init__.py |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 292f7eee62..31eee891da 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+Changes in synapse 0.2.1 (2014-09-03)
+=====================================
+
+Homeserver:
+ * Added support for signing up with a third party id.
+ * Add synctl scripts.
+ * Added rate limiting.
+ * Add option to change the external address the content repo uses.
+ * Presence bug fixes.
+
+Webclient:
+ * Added support for signing up with a third party id.
+ * Added support for banning and kicking users.
+ * Added support for displaying and setting ops.
+ * Added support for room names.
+ * Fix bugs with room membership event display.
+
 Changes in synapse 0.2.0 (2014-09-02)
 =====================================
 This update changes many configuration options, updates the
diff --git a/VERSION b/VERSION
index 0ea3a944b3..0c62199f16 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 564d789645..440e633966 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

From 0d5c7718c0a1b24701d4e5211518d9a0d7e21187 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 3 Sep 2014 22:49:47 +0100
Subject: [PATCH 2/2] make synctl default to homesever.log

---
 synctl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/synctl b/synctl
index 763bcce0a0..99dc545ba5 100755
--- a/synctl
+++ b/synctl
@@ -4,6 +4,7 @@ SYNAPSE="synapse/app/homeserver.py"
 
 CONFIGFILE="homeserver.yaml"
 PIDFILE="homeserver.pid"
+LOGFILE="homeserver.log"
 
 GREEN=$'\e[1;32m'
 NORMAL=$'\e[m'
@@ -21,13 +22,12 @@ case "$1" in
     fi
 
     echo -n "Starting ..."
-    $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file synapse.log
+    $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file "$LOGFILE"
     echo "${GREEN}started${NORMAL}"
     ;;
   stop)
     echo -n "Stopping ..."
-    test -f $PIDFILE && kill `cat $PIDFILE`
-    echo "${GREEN}stopped${NORMAL}"
+    test -f $PIDFILE && kill `cat $PIDFILE` && echo "${GREEN}stopped${NORMAL}"
     ;;
   restart)
     $0 stop && $0 start