diff --git a/ChangeLog b/ChangeLog index a8a56b215f..224110935e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +* Mon Sep 5 2016 Kristoffer Gronlund and many others +- Release 2.2.2 +- high: parse: Backport of event-driven alerts parser (#150) +- high: hb_report: Don't collect logs from journalctl if -M is set (bsc#990025) +- high: hb_report: Skip lines without timestamps in log correctly (bsc#989810) +- high: constants: Add maintenance to set of known attributes (bsc#981659) +- high: utils: Avoid deadlock if DC changes during idle wait (bsc#978480) +- medium: scripts: no-quorum-policy=ignore is deprecated (bsc#981056) +- medium: tmpfiles: Create temporary directory if non-existing (bsc#981583) +- medium: xmlutil: reduce unknown attribute to warning (bsc#981659) +- medium: ui_resource: Add force argument to resource cleanup (bsc#979420) +- parse: Use original _TARGET_RE + * Thu Apr 28 2016 Kristoffer Gronlund and many others - Release 2.2.1 - medium: ui_node: Fix crash in node fence command (bsc#974902) diff --git a/configure.ac b/configure.ac index fcc32be076..f83b921272 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl License: GNU General Public License (GPL) AC_PREREQ([2.53]) -AC_INIT([crmsh],[2.2.1],[users@clusterlabs.org]) +AC_INIT([crmsh],[2.2.2],[users@clusterlabs.org]) AC_ARG_WITH(version, [ --with-version=version Override package version (if you're a packager needing to pretend) ], diff --git a/doc/crm.8.adoc b/doc/crm.8.adoc index 0fb9da103a..7bfa474497 100644 --- a/doc/crm.8.adoc +++ b/doc/crm.8.adoc @@ -1,5 +1,5 @@ :man source: crm -:man version: 2.2.1 +:man version: 2.2.2 :man manual: crmsh documentation crm(8) diff --git a/setup.py b/setup.py index f4a3ef43c4..968833729d 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ SRC_PATH = os.path.relpath(os.path.join(os.path.dirname(__file__), "modules")) setup(name='crmsh', - version='2.2.0', + version='2.2.2', description='Command-line interface for High-Availability cluster management', author='Kristoffer Gronlund', author_email='kgronlund@suse.com',