Post release tasks

jtomson · Sep 12, 2019 · be47a77 · be47a77
1 parent 9534630
commit be47a77
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+Release 6.0.4 (Not yet released)
+-------------
+
+ * 
+
+
 Release 6.0.3
 -------------
 
@@ -35,6 +41,7 @@ Release 6.0.3
       - 2.5.3 -> 2.5.5
       - 2.6.1 -> 2.6.3
 
+
 Release 6.0.2
 -------------
 

diff --git a/dev/configkit-schemas/index.json b/dev/configkit-schemas/index.json
@@ -293,7 +293,7 @@
          "type" : "unsigned integer"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/6.0.3",
+         "default_value" : "Phusion_Passenger/6.0.4",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -822,7 +822,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/6.0.3",
+         "default_value" : "Phusion_Passenger/6.0.4",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -1683,7 +1683,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/6.0.3",
+         "default_value" : "Phusion_Passenger/6.0.4",
          "has_default_value" : "static",
          "type" : "string"
       },

diff --git a/src/agent/Core/Config.h b/src/agent/Core/Config.h
@@ -162,7 +162,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/6.0.3")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.4")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

diff --git a/src/agent/Core/Controller/Config.h b/src/agent/Core/Controller/Config.h
@@ -113,7 +113,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.0.3")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.4")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

diff --git a/src/agent/Watchdog/Config.h b/src/agent/Watchdog/Config.h
@@ -151,7 +151,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/6.0.3")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.4")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

diff --git a/src/cxx_supportlib/Constants.h b/src/cxx_supportlib/Constants.h
@@ -81,7 +81,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.3"
+#define PASSENGER_VERSION "6.0.4"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

diff --git a/src/ruby_supportlib/phusion_passenger.rb b/src/ruby_supportlib/phusion_passenger.rb
@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.3'
+  VERSION_STRING = '6.0.4'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.17.3'