From: pengbo <pengbo@sraoss.co.jp>
Date: Fri, 28 Apr 2017 05:31:57 +0000 (+0900)
Subject: Prepare 3.6.1.
X-Git-Tag: V3_6_1
X-Git-Url: http://git.postgresql.org/gitweb/static/maillist.html?a=commitdiff_plain;h=624c5442097c0903399d4d98a032dfcfefed445c;p=pgpooladmin.git

Prepare 3.6.1.
---

diff --git a/NEWS b/NEWS
index 7c76f66..2fb9c5d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
-
 ===============================================================================
 pgpoolAdmin 3.6
 ===============================================================================
 
+* Version 3.6.1 2017/04/28
+
+   - Add selection of version 3.6 in pgpoolAdmin install. (Bo Peng)
+
+   - Add selection of version 3.6 in pgpoolAdmin setting. (Bo Peng)
+
 * Version 3.6.0 2017/02/28
 
    - Fix incorrect display of watchdog status when using Pgpool-II 3.6.x. (Bo Peng)
@@ -15,10 +20,10 @@ pgpoolAdmin 3.6
      per bug276.
 
 ===============================================================================
-pgpoolAdmin 3.6
+pgpoolAdmin 3.5
 ===============================================================================
 
-* Version 3.5.3 2016/04/26
+* Version 3.5.3 2016/06/17
 
    - Fix readConfigParams() to treat the varliables with numbers. (Nozomi Anzai)
 
diff --git a/conf/pgmgt.conf.php b/conf/pgmgt.conf.php
index 27ec94e..d846688 100644
--- a/conf/pgmgt.conf.php
+++ b/conf/pgmgt.conf.php
@@ -1,6 +1,6 @@
 <?php
 define('_PGPOOL2_LANG', 'ja');
-define('_PGPOOL2_VERSION', '3.5');
+define('_PGPOOL2_VERSION', '3.6');
 define('_PGPOOL2_CONFIG_FILE', '/usr/local/etc/pgpool.conf');
 define('_PGPOOL2_PASSWORD_FILE', '/usr/local/etc/pcp.conf');
 define('_PGPOOL2_COMMAND', '/usr/local/bin/pgpool');
diff --git a/version.php b/version.php
index 566db61..d202651 100644
--- a/version.php
+++ b/version.php
@@ -23,6 +23,6 @@
  * @version    SVN: $Id$
  */
 
-$version = '3.6.0';
+$version = '3.6.1';
 
 ?>