Release Cubemap 1.2.2.

diff --git a/NEWS b/NEWS
index dc03d5ea42d1cc2bc68cd58269e23ad6d6580d32..9e9fcc8179d6f39d3becd77d67918f5b367739f4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Cubemap 1.2.2, 2016-04-02
+
+  * Fix literal IPv6 address parsing in URLs.
+
+  * Fix a bug (introduced in 1.2.0) where access.log would have monotonic
+    timestamps (typically time since boot) instead of real time.
+
+  * Increase the Metacube block size warning limit from 1MB to 10MB, as MP4
+    muxing can legitimately create huge blocks.
+
+
 Cubemap 1.2.1, 2015-08-30
 
   * Use libsystemd to inform systemd accurately about when the service is up

diff --git a/version.h b/version.h
index ed0d8fcf0b89b6444e66b5e2ff1805451ec53778..a74eac9eae303c6a0e7dff50ced985b31015f9e0 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.2-pre"
+#define SERVER_VERSION "1.2.2"
 #define SERVER_IDENTIFICATION "Cubemap/" SERVER_VERSION
 
 #endif  // !defined(_VERSION_H)