[Debian-ha-commits] [crmsh] 04/05: Merge tag 'upstream/2.1.3'

Richard Winters devrik-guest at moszumanska.debian.org
Thu Apr 16 07:32:09 UTC 2015


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

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

commit 6d6e89c753f7807d698fa63ca1b90e82317660b6
Merge: f3c0943 08a6530
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 16 03:27:29 2015 -0400

    Merge tag 'upstream/2.1.3'
    
    Upstream version 2.1.3

 .gitignore                                     |    8 +
 .hgignore                                      |    7 +
 .travis.yml                                    |    9 +
 AUTHORS                                        |   30 +
 COPYING                                        |  339 ++
 ChangeLog                                      |  525 +++
 Makefile.am                                    |   47 +
 NEWS                                           |    0
 README                                         |   58 +
 README.dev                                     |  263 ++
 TODO                                           |   32 +
 acinclude.m4                                   |   39 +
 autogen.sh                                     |  144 +
 configure.ac                                   |  297 ++
 contrib/Makefile.am                            |   25 +
 contrib/README.vimsyntax                       |   24 +
 contrib/bash_completion.sh                     |  248 ++
 contrib/pacemaker-crm.vim                      |  129 +
 contrib/pcmk.vim                               |  114 +
 crm                                            |   58 +
 crm.conf.in                                    |   51 +
 crmsh-cibadmin_can_patch.patch                 |   23 +
 crmsh.spec                                     |  227 ++
 doc/Makefile.am                                |   43 +
 doc/crm.8.txt                                  | 4336 ++++++++++++++++++++++++
 doc/crmsh_hb_report.8.txt                      |  477 +++
 doc/website-v1/404.txt                         |    9 +
 doc/website-v1/Makefile                        |   88 +
 doc/website-v1/about.txt                       |   19 +
 doc/website-v1/configuration.txt               |  132 +
 doc/website-v1/crm.conf                        |  587 ++++
 doc/website-v1/css/crm.css                     |  478 +++
 doc/website-v1/css/font-awesome.css            | 1338 ++++++++
 doc/website-v1/css/font-awesome.min.css        |    4 +
 doc/website-v1/development.txt                 |   62 +
 doc/website-v1/documentation.txt               |   43 +
 doc/website-v1/faq.txt                         |   60 +
 doc/website-v1/fonts/FontAwesome.otf           |  Bin 0 -> 62856 bytes
 doc/website-v1/fonts/fontawesome-webfont.eot   |  Bin 0 -> 38205 bytes
 doc/website-v1/fonts/fontawesome-webfont.svg   |  414 +++
 doc/website-v1/fonts/fontawesome-webfont.ttf   |  Bin 0 -> 80652 bytes
 doc/website-v1/fonts/fontawesome-webfont.woff  |  Bin 0 -> 44432 bytes
 doc/website-v1/history-guide.txt               |    3 +
 doc/website-v1/img/laptop.png                  |  Bin 0 -> 2569 bytes
 doc/website-v1/img/loader.gif                  |  Bin 0 -> 2545 bytes
 doc/website-v1/img/servers.gif                 |  Bin 0 -> 4513 bytes
 doc/website-v1/index.txt                       |   19 +
 doc/website-v1/installation.txt                |   59 +
 doc/website-v1/make-news.py                    |  137 +
 doc/website-v1/man-1.2.txt                     | 3437 +++++++++++++++++++
 doc/website-v1/man-2.0.txt                     | 4319 +++++++++++++++++++++++
 doc/website-v1/news.txt                        |   11 +
 doc/website-v1/news/2014-06-30-release-2_1.txt |   93 +
 doc/website-v1/postprocess.py                  |  139 +
 doc/website-v1/rsctest-guide.txt               |  238 ++
 doc/website-v1/scripts.txt                     |  445 +++
 doc/website-v1/start-guide.txt                 |  290 ++
 hb_report/Makefile.am                          |   25 +
 hb_report/ha_cf_support.sh                     |   83 +
 hb_report/hb_report.in                         | 1469 ++++++++
 hb_report/openais_conf_support.sh              |   97 +
 hb_report/utillib.sh                           |  752 ++++
 modules/Makefile.am                            |   81 +
 modules/__init__.py                            |    2 +
 modules/cache.py                               |   52 +
 modules/cibconfig.py                           | 3594 ++++++++++++++++++++
 modules/cibstatus.py                           |  403 +++
 modules/cibverify.py                           |   43 +
 modules/clidisplay.py                          |  130 +
 modules/cliformat.py                           |  415 +++
 modules/cmd_status.py                          |   73 +
 modules/command.py                             |  497 +++
 modules/completers.py                          |   78 +
 modules/config.py                              |  411 +++
 modules/constants.py                           |  289 ++
 modules/corosync.py                            |  532 +++
 modules/crm_gv.py                              |  242 ++
 modules/crm_pssh.py                            |  237 ++
 modules/help.py                                |  403 +++
 modules/idmgmt.py                              |  203 ++
 modules/log_patterns.py                        |   77 +
 modules/log_patterns_118.py                    |   75 +
 modules/main.py                                |  389 +++
 modules/msg.py                                 |  283 ++
 modules/options.py                             |   31 +
 modules/ordereddict.py                         |  130 +
 modules/orderedset.py                          |   98 +
 modules/pacemaker.py                           |  398 +++
 modules/parse.py                               | 1600 +++++++++
 modules/ra.py                                  |  836 +++++
 modules/report.py                              | 1676 +++++++++
 modules/rsctest.py                             |  433 +++
 modules/schema.py                              |  146 +
 modules/scripts.py                             |  743 ++++
 modules/template.py                            |  195 ++
 modules/term.py                                |  186 +
 modules/tmpfiles.py                            |   71 +
 modules/ui_assist.py                           |  146 +
 modules/ui_cib.py                              |  234 ++
 modules/ui_cibstatus.py                        |  114 +
 modules/ui_cluster.py                          |  214 ++
 modules/ui_configure.py                        |  806 +++++
 modules/ui_context.py                          |  371 ++
 modules/ui_corosync.py                         |  158 +
 modules/ui_history.py                          |  666 ++++
 modules/ui_node.py                             |  321 ++
 modules/ui_options.py                          |  191 ++
 modules/ui_ra.py                               |  108 +
 modules/ui_report.py                           |   41 +
 modules/ui_resource.py                         |  576 ++++
 modules/ui_root.py                             |  184 +
 modules/ui_script.py                           |   68 +
 modules/ui_site.py                             |   92 +
 modules/ui_template.py                         |  371 ++
 modules/ui_utils.py                            |  174 +
 modules/userdir.py                             |   76 +
 modules/utils.py                               | 1357 ++++++++
 modules/xmlbuilder.py                          |  117 +
 modules/xmlutil.py                             | 1323 ++++++++
 requirements.txt                               |    3 +
 scripts/Makefile.am                            |    2 +
 scripts/add/Makefile.am                        |   28 +
 scripts/add/add.py                             |  128 +
 scripts/add/main.yml                           |   34 +
 scripts/check-uptime/Makefile.am               |   28 +
 scripts/check-uptime/fetch.py                  |    7 +
 scripts/check-uptime/main.yml                  |   17 +
 scripts/check-uptime/report.py                 |   11 +
 scripts/health/Makefile.am                     |   27 +
 scripts/health/collect.py                      |   99 +
 scripts/health/hahealth.py                     |   34 +
 scripts/health/main.yml                        |   12 +
 scripts/health/report.py                       |  125 +
 scripts/init/Makefile.am                       |   28 +
 scripts/init/authkey.py                        |   61 +
 scripts/init/basic.cib.template                |   13 +
 scripts/init/collect.py                        |    7 +
 scripts/init/configure.py                      |  134 +
 scripts/init/corosync.conf.template            |   46 +
 scripts/init/init.py                           |   36 +
 scripts/init/main.yml                          |   52 +
 scripts/init/verify.py                         |   48 +
 scripts/remove/Makefile.am                     |   28 +
 scripts/remove/main.yml                        |   20 +
 scripts/remove/remove.py                       |   46 +
 templates/Makefile.am                          |   26 +
 templates/apache                               |   61 +
 templates/clvm                                 |   59 +
 templates/filesystem                           |   44 +
 templates/gfs2                                 |   74 +
 templates/gfs2-base                            |   46 +
 templates/ocfs2                                |   61 +
 templates/sbd                                  |   34 +
 templates/virtual-ip                           |   39 +
 test/Makefile.am                               |   28 +
 test/README.regression                         |  154 +
 test/cib-tests.sh                              |  105 +
 test/cibtests/001.exp.xml                      |   20 +
 test/cibtests/001.input                        |    6 +
 test/cibtests/002.exp.xml                      |   28 +
 test/cibtests/002.input                        |    8 +
 test/cibtests/003.exp.xml                      |   29 +
 test/cibtests/003.input                        |   11 +
 test/cibtests/004.exp.xml                      |   29 +
 test/cibtests/004.input                        |   11 +
 test/cibtests/Makefile.am                      |   29 +
 test/cibtests/shadow.base                      |   10 +
 test/crm-interface                             |   99 +
 test/defaults                                  |    2 +
 test/descriptions                              |   33 +
 test/evaltest.sh                               |  127 +
 test/history-test.tar.bz2                      |  Bin 0 -> 51085 bytes
 test/list-undocumented-commands.py             |   36 +
 test/regression.sh                             |  213 ++
 test/testcases/Makefile.am                     |   36 +
 test/testcases/acl                             |   60 +
 test/testcases/acl.excl                        |    1 +
 test/testcases/acl.exp                         |   87 +
 test/testcases/basicset                        |   15 +
 test/testcases/commit                          |   40 +
 test/testcases/commit.exp                      |   77 +
 test/testcases/common.excl                     |   20 +
 test/testcases/common.filter                   |    5 +
 test/testcases/confbasic                       |   76 +
 test/testcases/confbasic-xml                   |   72 +
 test/testcases/confbasic-xml.exp               |  169 +
 test/testcases/confbasic.exp                   |  133 +
 test/testcases/delete                          |   64 +
 test/testcases/delete.exp                      |  153 +
 test/testcases/edit                            |   59 +
 test/testcases/edit.excl                       |    1 +
 test/testcases/edit.exp                        |  113 +
 test/testcases/file                            |   14 +
 test/testcases/file.exp                        |   53 +
 test/testcases/history                         |   40 +
 test/testcases/history.excl                    |    1 +
 test/testcases/history.exp                     |  288 ++
 test/testcases/history.post                    |    3 +
 test/testcases/history.pre                     |    3 +
 test/testcases/newfeatures                     |   25 +
 test/testcases/newfeatures.exp                 |   44 +
 test/testcases/node                            |   10 +
 test/testcases/node.exp                        |  162 +
 test/testcases/options                         |   23 +
 test/testcases/options.exp                     |   64 +
 test/testcases/ra                              |    7 +
 test/testcases/ra.exp                          |  140 +
 test/testcases/ra.filter                       |   16 +
 test/testcases/resource                        |   39 +
 test/testcases/resource.exp                    |  734 ++++
 test/testcases/rset                            |   21 +
 test/testcases/rset-xml                        |   19 +
 test/testcases/rset-xml.exp                    |   33 +
 test/testcases/rset.exp                        |   56 +
 test/testcases/shadow                          |   10 +
 test/testcases/shadow.exp                      |   18 +
 test/testcases/xmlonly.sh                      |    5 +
 test/unit-tests.sh                             |   13 +
 test/unittests/__init__.py                     |   54 +
 test/unittests/bug-862577_corosync.conf        |   51 +
 test/unittests/corosync.conf.1                 |   81 +
 test/unittests/corosync.conf.2                 |   58 +
 test/unittests/schemas/acls-1.1.rng            |   66 +
 test/unittests/schemas/acls-1.2.rng            |   66 +
 test/unittests/schemas/constraints-1.0.rng     |  180 +
 test/unittests/schemas/constraints-1.1.rng     |  246 ++
 test/unittests/schemas/constraints-1.2.rng     |  219 ++
 test/unittests/schemas/fencing.rng             |   29 +
 test/unittests/schemas/nvset.rng               |   35 +
 test/unittests/schemas/pacemaker-1.0.rng       |  121 +
 test/unittests/schemas/pacemaker-1.1.rng       |  161 +
 test/unittests/schemas/pacemaker-1.2.rng       |  146 +
 test/unittests/schemas/resources-1.0.rng       |  177 +
 test/unittests/schemas/resources-1.1.rng       |  225 ++
 test/unittests/schemas/resources-1.2.rng       |  225 ++
 test/unittests/schemas/rule.rng                |  137 +
 test/unittests/schemas/score.rng               |   18 +
 test/unittests/schemas/versions.rng            |   24 +
 test/unittests/test.conf                       |   12 +
 test/unittests/test_bugs.py                    |  446 +++
 test/unittests/test_cib.py                     |   41 +
 test/unittests/test_cliformat.py               |  227 ++
 test/unittests/test_corosync.py                |  134 +
 test/unittests/test_objset.py                  |   50 +
 test/unittests/test_parse.py                   |  662 ++++
 test/unittests/test_resource.py                |   46 +
 test/unittests/test_utils.py                   |  137 +
 utils/Makefile.am                              |   27 +
 utils/crm_clean.py                             |   26 +
 utils/crm_init.py                              |  263 ++
 utils/crm_pkg.py                               |  281 ++
 utils/crm_rpmcheck.py                          |   56 +
 utils/crm_script.py                            |  180 +
 version.in                                     |    2 +
 254 files changed, 55590 insertions(+)

-- 
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