update version

fastly · May 9, 2015 · 1735946 · 1735946
1 parent 30c0067
commit 1735946
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,21 @@
 Pushpin Changelog
 =================
 
-v. 1.0.0 (09-16-2014) - Stable version.
-v. 1.1.0 (03-08-2015) - SUB socket input. SockJS client support.
-v. 1.1.1 (04-17-2015) - Fix auto-cross-origin feature.
+v. 1.2.0 (05-09-2015)
+
+  * http-stream: close action, keep-alive.
+  * Check for new pushpin versions.
+  * ZeroMQ endpoint discovery via command socket.
+  * pushpin-publish command line tool.
+
+v. 1.1.1 (04-17-2015)
+
+  * Fix auto-cross-origin feature.
+
+v. 1.1.0 (03-08-2015)
+
+  * SUB socket input. SockJS client support.
+
+v. 1.0.0 (09-16-2014)
+
+  * Stable version.
diff --git a/handler/pushpin-handler b/handler/pushpin-handler
@@ -21,7 +21,7 @@ import sys
 import os
 import ConfigParser
 
-version = '1.1.1'
+version = '1.2.0'
 
 config_file = "/etc/pushpin/pushpin.conf"
 log_file = None

diff --git a/m2adapter/src/app.cpp b/m2adapter/src/app.cpp
@@ -36,7 +36,7 @@
 #include "log.h"
 #include "layertracker.h"
 
-#define VERSION "1.1.1"
+#define VERSION "1.2.0"
 
 #define DEFAULT_HWM 1000
 #define EXPIRE_INTERVAL 1000

diff --git a/proxy/src/app.cpp b/proxy/src/app.cpp
@@ -31,7 +31,7 @@
 #include "xffrule.h"
 #include "engine.h"
 
-#define VERSION "1.1.1"
+#define VERSION "1.2.0"
 
 static void trimlist(QStringList *list)
 {

diff --git a/pushpin b/pushpin
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 default_config_dir = '/etc/pushpin'
-version = '1.1.1'
+version = '1.2.0'
 
 import sys
 import os