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

Adrian Vondendriesch discostu-guest at moszumanska.debian.org
Tue May 3 18:30:35 UTC 2016


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

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

commit 9588dc5f62e9490e20f3495ba98f3d7fe54ad0dd
Merge: 4d0bea9 18ff19e
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Tue May 3 20:03:58 2016 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 .gitignore                               |    5 +
 .landscape.yaml                          |   14 +
 AUTHORS                                  |    6 +
 ChangeLog                                |   60 ++
 Makefile.am                              |    9 +-
 README.md                                |   30 +-
 configure.ac                             |    4 +-
 contrib/git-hook-pre-commit              |   14 +
 contrib/pygments_crmsh_lexers/ansiclr.py |    5 +-
 contrib/pygments_crmsh_lexers/crmsh.py   |   13 +-
 data-manifest                            |    2 +
 doc/crm.8.adoc                           |   37 +-
 doc/website-v1/man-1.2.adoc              |    2 +-
 doc/website-v1/man-2.0.adoc              |    2 +-
 hb_report/hb_report.in                   |   28 +-
 hb_report/utillib.sh                     |   25 +-
 modules/cache.py                         |    4 +-
 modules/cibconfig.py                     |  314 ++++----
 modules/cibstatus.py                     |    4 +-
 modules/clidisplay.py                    |   22 +-
 modules/cliformat.py                     |   14 +-
 modules/command.py                       |   25 +-
 modules/config.py                        |   21 +-
 modules/constants.py                     |    8 +-
 modules/corosync.py                      |   47 +-
 modules/crm_gv.py                        |   48 +-
 modules/crm_pssh.py                      |   32 +-
 modules/handles.py                       |    4 +-
 modules/help.py                          |    2 +-
 modules/history.py                       | 1190 ++++++------------------------
 modules/idmgmt.py                        |    8 +-
 modules/log_patterns.py                  |   73 +-
 modules/log_patterns_118.py              |   76 --
 modules/logparser.py                     |  627 ++++++++++++++++
 modules/logtime.py                       |  218 ++++++
 modules/main.py                          |   13 +-
 modules/ordereddict.py                   |  260 +++----
 modules/orderedset.py                    |   10 +-
 modules/pacemaker.py                     |   16 +-
 modules/parse.py                         |   38 +-
 modules/ra.py                            |   86 ++-
 modules/rsctest.py                       |   12 +-
 modules/schema.py                        |    6 +-
 modules/scripts.py                       |  134 ++--
 modules/term.py                          |   46 +-
 modules/tmpfiles.py                      |    8 +-
 modules/ui_cib.py                        |    2 +-
 modules/ui_configure.py                  |   23 +-
 modules/ui_context.py                    |   22 +-
 modules/ui_corosync.py                   |    4 +-
 modules/ui_history.py                    |   49 +-
 modules/ui_maintenance.py                |    3 +-
 modules/ui_node.py                       |   21 +-
 modules/ui_options.py                    |    2 +-
 modules/ui_script.py                     |   54 +-
 modules/ui_template.py                   |    2 +-
 modules/ui_utils.py                      |    1 -
 modules/utils.py                         |  177 +++--
 modules/xmlutil.py                       |   67 +-
 requirements.txt                         |    1 +
 scripts/apache/main.yml                  |    7 +-
 scripts/clvm-vg/main.yml                 |    2 +-
 scripts/clvm/main.yml                    |    2 +-
 scripts/db2/main.yml                     |    6 +-
 scripts/drbd/main.yml                    |    2 +-
 scripts/exportfs/main.yml                |   14 +-
 scripts/filesystem/main.yml              |    4 +-
 scripts/gfs2-base/main.yml               |   10 +-
 scripts/gfs2/main.yml                    |   28 +-
 scripts/health/collect.py                |    2 +-
 scripts/init/configure.py                |    2 +-
 scripts/libvirt/main.yml                 |    8 +-
 scripts/mailto/main.yml                  |    4 +-
 scripts/nfsserver/main.yml               |   24 +-
 scripts/ocfs2/main.yml                   |   72 +-
 scripts/raid-lvm/main.yml                |    8 +-
 scripts/sap-as/main.yml                  |   10 +-
 scripts/sap-ci/main.yml                  |   10 +-
 scripts/sap-db/main.yml                  |   10 +-
 scripts/sap-simple-stack-plus/main.yml   |   34 +-
 scripts/sap-simple-stack/main.yml        |   18 +-
 scripts/sbd/main.yml                     |   24 +-
 setup.py                                 |    6 +-
 test/list-undocumented-commands.py       |    2 +-
 test/profile-history.sh                  |   22 +
 test/testcases/edit.exp                  |    1 -
 test/testcases/history                   |    3 +
 test/testcases/history.exp               |  154 +++-
 test/testcases/ra.exp                    |    6 +-
 test/testcases/scripts.exp               |   44 +-
 test/unittests/test_bugs.py              |   32 +-
 test/unittests/test_cliformat.py         |   21 +-
 test/unittests/test_corosync.py          |   22 +-
 test/unittests/test_scripts.py           |   51 ++
 test/unittests/test_time.py              |   11 +-
 95 files changed, 2688 insertions(+), 2038 deletions(-)

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



More information about the Debian-HA-Commits mailing list