Release Cubemap 1.2.1.

diff --git a/NEWS b/NEWS
index 99961ed168b5ca0ef25050cc44a798cdfa17be3c..dc03d5ea42d1cc2bc68cd58269e23ad6d6580d32 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Cubemap 1.2.1, 2015-08-30
+
+  * Use libsystemd to inform systemd accurately about when the service is up
+    and running. Note that this means Cubemap now also depends on libsystemd.
+
+  * Add a simple HTTP endpoint that returns a very short string (gen204),
+    for timing purposes.
+
+  * Document config options better in cubemap.config.sample.
+ 
+
 Cubemap 1.2.0, 2015-07-24
 
   * Add support for server-side prebuffering (force_prebuffering=NNN

diff --git a/version.h b/version.h
index 949efbb952edcb7cb83c36ee4631f366122fbce4..05698b3b9b39bc3bfe89d8fbdd5d22abc6e9bdb2 100644 (file)
--- a/version.h
+++ b/version.h
@@ -3,7 +3,7 @@
 
 // Version number. Don't expect this to change all that often.
 
-#define SERVER_VERSION "1.2.1-pre"
+#define SERVER_VERSION "1.2.1"
 #define SERVER_IDENTIFICATION "Cubemap/" SERVER_VERSION
 
 #endif  // !defined(_VERSION_H)