[Debian-ha-commits] [crmsh] 02/02: Merge tag 'upstream/2.3.2'

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository crmsh.

commit 3fa8213a534e3accc747c0143598cd0a1061dd13
Merge: de16729 4b7ca3f
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Oct 28 15:07:46 2016 +0200

    Merge tag 'upstream/2.3.2'
    
    Upstream version 2.3.2

 ChangeLog                                         | 20 +++++
 configure.ac                                      |  2 +-
 crm                                               |  2 +-
 crmsh/cibconfig.py                                | 40 ++++++++--
 crmsh/cliformat.py                                |  2 +
 crmsh/cmd_status.py                               | 19 ++---
 crmsh/corosync.py                                 |  1 +
 crmsh/crm_pssh.py                                 |  2 +-
 crmsh/history.py                                  |  6 +-
 crmsh/logparser.py                                | 28 ++++---
 crmsh/parse.py                                    | 36 +++++++--
 crmsh/ui_configure.py                             |  8 +-
 crmsh/ui_script.py                                |  2 +-
 crmsh/utils.py                                    | 35 +++++++++
 doc/crm.8.adoc                                    | 27 ++++++-
 doc/development.md                                | 93 ++++++++++++++++++++++-
 doc/website-v1/news.adoc                          |  7 +-
 doc/website-v1/news/2016-09-01-release-2_1_7.adoc | 46 +++++++++++
 doc/website-v1/news/2016-09-02-release-2_3_1.adoc | 33 ++++++++
 doc/website-v1/news/2016-09-05-release-2_2_2.adoc | 36 +++++++++
 hb_report/hb_report.in                            |  7 ++
 scripts/health/collect.py                         |  5 +-
 scripts/init/corosync.conf.template               | 15 +++-
 setup.py                                          |  2 +-
 test/unittests/test_cliformat.py                  | 26 +++++++
 25 files changed, 443 insertions(+), 57 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/crmsh.git