diff --git a/docs/SETTINGS.rst b/docs/SETTINGS.rst index 7946c07c..e61593a5 100644 --- a/docs/SETTINGS.rst +++ b/docs/SETTINGS.rst @@ -43,9 +43,12 @@ Bootstrap configuration - **- createdb** - **post\_bootstrap** or **post\_init**: An additional script that will be executed after initializing the cluster. The script receives a connection string URL (with the cluster superuser as a user name). The PGPASSFILE variable is set to the location of pgpass file. +.. _consul_settings: + Consul ------ Most of the parameters are optional, but you have to specify one of the **host** or **url** + - **host**: the host:port for the Consul endpoint, in format: http(s)://host:port - **url**: url for the Consul endpoint - **port**: (optional) Consul port @@ -59,6 +62,7 @@ Most of the parameters are optional, but you have to specify one of the **host** Etcd ---- Most of the parameters are optional, but you have to specify one of the **host**, **url**, **proxy** or **srv** + - **host**: the host:port for the etcd endpoint. - **url**: url for the etcd - **proxy**: proxy url for the etcd. If you are connecting to the etcd using proxy, use this parameter instead of **url** diff --git a/docs/releases.rst b/docs/releases.rst index 743d470e..583e86d0 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -3,6 +3,70 @@ Release notes ============= +Version 1.3.4 +------------- + +**Different Consul improvements** + +- Pass the consul token as a header (Andrew Colin Kissa) + + Headers are now the prefered way to pass the token to the consul `API `__. + + +- Advanced configuration for Consul (Alexander Kukushkin) + + possibility to specify ``scheme``, ``token``, client and ca certificates :ref:`details `. + +- compatibility with python-consul-0.7.1 and above (Alexander) + + new python-consul module has changed signature of some methods + +- "Could not take out TTL lock" message was never logged (Alexander) + + Not a critical bug, but lack of proper logging complicates investigation in case of problems. + + +**Quote synchronous_standby_names using quote_ident** + +- When writing ``synchronous_standby_names`` into the ``postgresql.conf`` its value must be quoted (Alexander) + + If it is not quoted properly, PostgreSQL will effectively disable synchronous replication and continue to work. + + +**Different bugfixes around pause state, mostly related to watchdog** (Alexander) + +- Do not send keepalives if watchdog is not active +- Avoid activating watchdog in a pause mode +- Set correct postgres state in pause mode +- Do not try to run queries from API if postgres is stopped + + +Version 1.3.3 +------------- + +**Bugfixes** + +- synchronous replication was disabled shortly after promotion even when synchronous_mode_strict was turned on (Alexander Kukushkin) +- create empty ``pg_ident.conf`` file if it is missing after restoring from the backup (Alexander) +- open access in ``pg_hba.conf`` to all databases, not only postgres (Franco Bellagamba) + + +Version 1.3.2 +------------- + +**Bugfix** + +- patronictl edit-config didn't work with ZooKeeper (Alexander Kukushkin) + + +Version 1.3.1 +------------- + +**Bugfix** + +- failover via API was broken due to change in ``_MemberStatus`` (Alexander Kukushkin) + + Version 1.3 ----------- diff --git a/patroni/version.py b/patroni/version.py index 07f744ca..ac422f13 100644 --- a/patroni/version.py +++ b/patroni/version.py @@ -1 +1 @@ -__version__ = '1.3.3' +__version__ = '1.3.4' diff --git a/tests/test_consul.py b/tests/test_consul.py index 004b6fc0..f3691803 100644 --- a/tests/test_consul.py +++ b/tests/test_consul.py @@ -45,7 +45,7 @@ class TestHTTPClient(unittest.TestCase): def test_get(self): self.client.get(Mock(), '') - self.client.get(Mock(), '', {'wait': '1s', 'index': 1}) + self.client.get(Mock(), '', {'wait': '1s', 'index': 1, 'token': 'foo'}) self.client.http.request.return_value.status = 500 self.assertRaises(ConsulInternalError, self.client.get, Mock(), '')