[Debian-ha-commits] [crmsh] 04/16: Merge tag 'upstream/2.2.0'
Richard Winters
devrik-guest at moszumanska.debian.org
Tue Jan 26 22:25:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository crmsh.
commit 5b263030ebefad76a57b5f7875c68a3b36143645
Merge: 11dfb80 b51736a
Author: Richard B Winters <rik at mmogp.com>
Date: Tue Jan 26 15:46:02 2016 -0500
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
.gitignore | 6 +
.travis.yml | 3 +-
AUTHORS | 1 +
ChangeLog | 432 ++-
Makefile.am | 73 +-
README | 58 -
README.dev | 263 --
README.md | 62 +
TODO | 2 +
acinclude.m4 | 39 -
configure.ac | 277 +-
contrib/Makefile.am | 25 -
contrib/README.vimsyntax | 12 +-
contrib/pygments_crmsh_lexers/__init__.py | 2 +
contrib/pygments_crmsh_lexers/ansiclr.py | 50 +
contrib/pygments_crmsh_lexers/crmsh.py | 90 +
contrib/setup.py | 32 +
crm | 74 +-
crm.conf.in | 20 +-
crmsh-cibadmin_can_patch.patch | 23 -
crmsh.spec | 105 +-
data-manifest | 172 +
doc/Makefile.am | 43 -
doc/{crm.8.txt => crm.8.adoc} | 3949 +++++++++++---------
...rmsh_hb_report.8.txt => crmsh_hb_report.8.adoc} | 0
doc/development.md | 225 ++
doc/sort-doc.py | 82 +
doc/website-v1/{404.txt => 404.adoc} | 0
doc/website-v1/Makefile | 94 +-
doc/website-v1/{about.txt => about.adoc} | 0
.../{configuration.txt => configuration.adoc} | 0
doc/website-v1/crmold.conf | 602 +++
doc/website-v1/css/crm.css | 8 +
.../{development.txt => development.adoc} | 2 +-
.../{documentation.txt => documentation.adoc} | 9 +-
doc/website-v1/{faq.txt => faq.adoc} | 0
doc/website-v1/history-guide.adoc | 275 ++
doc/website-v1/history-guide.txt | 3 -
.../img/history-guide/sample-cluster.conf.png | Bin 0 -> 10009 bytes
.../img/history-guide/smallapache-start.png | Bin 0 -> 1146 bytes
doc/website-v1/img/icons/README | 5 +
doc/website-v1/img/icons/callouts/1.png | Bin 0 -> 329 bytes
doc/website-v1/img/icons/callouts/10.png | Bin 0 -> 361 bytes
doc/website-v1/img/icons/callouts/11.png | Bin 0 -> 565 bytes
doc/website-v1/img/icons/callouts/12.png | Bin 0 -> 617 bytes
doc/website-v1/img/icons/callouts/13.png | Bin 0 -> 623 bytes
doc/website-v1/img/icons/callouts/14.png | Bin 0 -> 411 bytes
doc/website-v1/img/icons/callouts/15.png | Bin 0 -> 640 bytes
doc/website-v1/img/icons/callouts/2.png | Bin 0 -> 353 bytes
doc/website-v1/img/icons/callouts/3.png | Bin 0 -> 350 bytes
doc/website-v1/img/icons/callouts/4.png | Bin 0 -> 345 bytes
doc/website-v1/img/icons/callouts/5.png | Bin 0 -> 348 bytes
doc/website-v1/img/icons/callouts/6.png | Bin 0 -> 355 bytes
doc/website-v1/img/icons/callouts/7.png | Bin 0 -> 344 bytes
doc/website-v1/img/icons/callouts/8.png | Bin 0 -> 357 bytes
doc/website-v1/img/icons/callouts/9.png | Bin 0 -> 357 bytes
doc/website-v1/img/icons/caution.png | Bin 0 -> 2734 bytes
doc/website-v1/img/icons/example.png | Bin 0 -> 2599 bytes
doc/website-v1/img/icons/home.png | Bin 0 -> 1340 bytes
doc/website-v1/img/icons/important.png | Bin 0 -> 2980 bytes
doc/website-v1/img/icons/next.png | Bin 0 -> 1302 bytes
doc/website-v1/img/icons/note.png | Bin 0 -> 2494 bytes
doc/website-v1/img/icons/prev.png | Bin 0 -> 1348 bytes
doc/website-v1/img/icons/tip.png | Bin 0 -> 2718 bytes
doc/website-v1/img/icons/up.png | Bin 0 -> 1320 bytes
doc/website-v1/img/icons/warning.png | Bin 0 -> 3214 bytes
.../history-guide/basic-transition.typescript | 22 +
.../include/history-guide/diff.typescript | 11 +
.../include/history-guide/info.typescript | 16 +
.../include/history-guide/nfs-probe-err.typescript | 20 +
.../history-guide/resource-trace.typescript | 7 +
.../include/history-guide/resource.typescript | 6 +
.../include/history-guide/sample-cluster.conf.crm | 54 +
.../history-guide/status-probe-fail.typescript | 15 +
.../stonith-corosync-stopped.typescript | 8 +
.../history-guide/transition-log.typescript | 13 +
doc/website-v1/{index.txt => index.adoc} | 5 +
.../{installation.txt => installation.adoc} | 0
doc/website-v1/make-news.py | 9 +-
doc/website-v1/{man-1.2.txt => man-1.2.adoc} | 0
doc/website-v1/{man-2.0.txt => man-2.0.adoc} | 0
doc/website-v1/news.adoc | 19 +
doc/website-v1/news.txt | 11 -
...release-2_1.txt => 2014-06-30-release-2_1.adoc} | 0
doc/website-v1/news/2014-10-28-release-2_1_1.adoc | 58 +
doc/website-v1/news/2015-01-26-release-2_1_2.adoc | 69 +
doc/website-v1/news/2015-04-10-release-2_1_3.adoc | 68 +
doc/website-v1/news/2015-05-13-release-2_1_4.adoc | 126 +
.../news/2015-05-25-getting-started-jp.adoc | 17 +
doc/website-v1/news/2016-01-12-release-2_1_5.adoc | 56 +
doc/website-v1/postprocess.py | 2 +-
.../{rsctest-guide.txt => rsctest-guide.adoc} | 0
doc/website-v1/scripts.adoc | 643 ++++
doc/website-v1/scripts.txt | 445 ---
.../{start-guide.txt => start-guide.adoc} | 2 +-
hb_report/Makefile.am | 25 -
hb_report/ha_cf_support.sh | 18 +-
hb_report/hb_report.in | 90 +-
hb_report/openais_conf_support.sh | 18 +-
hb_report/utillib.sh | 24 +-
modules/Makefile.am | 81 -
modules/cache.py | 16 +-
modules/cibconfig.py | 718 ++--
modules/cibstatus.py | 28 +-
modules/cibverify.py | 25 +-
modules/clidisplay.py | 33 +-
modules/cliformat.py | 34 +-
modules/cmd_status.py | 81 +-
modules/command.py | 72 +-
modules/completers.py | 18 +-
modules/config.py | 138 +-
modules/constants.py | 134 +-
modules/corosync.py | 117 +-
modules/crm_gv.py | 43 +-
modules/crm_pssh.py | 92 +-
modules/handles.py | 128 +
modules/help.py | 82 +-
modules/{report.py => history.py} | 599 +--
modules/idmgmt.py | 24 +-
modules/log_patterns.py | 109 +-
modules/log_patterns_118.py | 105 +-
modules/main.py | 308 +-
modules/msg.py | 28 +-
modules/options.py | 17 +-
modules/pacemaker.py | 44 +-
modules/parse.py | 236 +-
modules/ra.py | 258 +-
modules/rsctest.py | 102 +-
modules/schema.py | 47 +-
modules/scripts.py | 2449 +++++++++---
modules/template.py | 25 +-
modules/term.py | 21 +-
modules/tmpfiles.py | 18 +-
modules/ui_assist.py | 32 +-
modules/ui_cib.py | 48 +-
modules/ui_cibstatus.py | 28 +-
modules/ui_cluster.py | 110 +-
modules/ui_configure.py | 236 +-
modules/ui_context.py | 42 +-
modules/ui_corosync.py | 28 +-
modules/ui_history.py | 211 +-
modules/ui_maintenance.py | 94 +
modules/ui_node.py | 109 +-
modules/ui_options.py | 58 +-
modules/ui_ra.py | 64 +-
modules/ui_report.py | 39 +-
modules/ui_resource.py | 156 +-
modules/ui_root.py | 164 +-
modules/ui_script.py | 525 ++-
modules/ui_site.py | 26 +-
modules/ui_template.py | 49 +-
modules/ui_utils.py | 22 +-
modules/userdir.py | 20 +-
modules/utils.py | 298 +-
modules/xmlbuilder.py | 19 +-
modules/xmlutil.py | 191 +-
requirements.txt | 1 +
scripts/Makefile.am | 2 -
scripts/add/add.py | 32 +-
scripts/add/main.yml | 71 +-
scripts/apache/main.yml | 68 +
scripts/check-uptime/Makefile.am | 28 -
scripts/check-uptime/main.yml | 30 +-
scripts/clvm-vg/main.yml | 46 +
scripts/clvm/main.yml | 39 +
scripts/database/main.yml | 34 +
scripts/db2-hadr/main.yml | 43 +
scripts/db2/main.yml | 45 +
scripts/drbd/main.yml | 39 +
scripts/exportfs/main.yml | 35 +
scripts/filesystem/main.yml | 30 +
scripts/gfs2-base/main.yml | 27 +
scripts/gfs2/main.yml | 51 +
scripts/haproxy/haproxy.cfg | 13 +
scripts/haproxy/main.yml | 37 +
scripts/health/Makefile.am | 27 -
scripts/health/collect.py | 2 +-
scripts/health/main.yml | 23 +-
scripts/init/Makefile.am | 28 -
scripts/init/authkey.py | 20 +-
scripts/init/main.yml | 108 +-
scripts/libvirt/main.yml | 63 +
scripts/lvm/main.yml | 16 +
scripts/mailto/main.yml | 27 +
scripts/nfsserver/main.yml | 73 +
scripts/ocfs2/main.yml | 56 +
scripts/oracle/main.yml | 51 +
scripts/raid-lvm/main.yml | 25 +
scripts/raid1/main.yml | 17 +
scripts/remove/Makefile.am | 28 -
scripts/remove/main.yml | 38 +-
scripts/sap-as/main.yml | 70 +
scripts/sap-ci/main.yml | 70 +
scripts/sap-db/main.yml | 63 +
scripts/sap-simple-stack-plus/main.yml | 220 ++
scripts/sap-simple-stack/main.yml | 183 +
scripts/sapdb/main.yml | 32 +
scripts/sapinstance/main.yml | 48 +
scripts/sbd/main.yml | 44 +
scripts/virtual-ip/main.yml | 24 +
setup.py | 16 +
templates/Makefile.am | 26 -
test/Makefile.am | 28 -
test/bugs-test.txt | 11 +
test/cib-tests.sh | 17 +-
test/cibtests/002.exp.xml | 6 +-
test/cibtests/002.input | 4 +-
test/cibtests/003.exp.xml | 6 +-
test/cibtests/003.input | 4 +-
test/cibtests/004.exp.xml | 6 +-
test/cibtests/004.input | 4 +-
test/cibtests/Makefile.am | 29 -
test/crm-interface | 16 +-
test/descriptions | 16 +-
test/evaltest.sh | 19 +-
test/list-undocumented-commands.py | 2 +-
test/regression.sh | 21 +-
test/run | 13 +
test/testcases/Makefile.am | 36 -
test/testcases/basicset | 2 +
test/testcases/bugs | 42 +
test/testcases/bugs.exp | 98 +
test/testcases/commit.exp | 18 +-
test/testcases/common.excl | 1 +
test/testcases/confbasic | 1 +
test/testcases/confbasic-xml.exp | 2 +-
test/testcases/confbasic.exp | 15 +-
test/testcases/delete.exp | 30 +-
test/testcases/edit | 23 +-
test/testcases/edit.exp | 99 +-
test/testcases/history.exp | 12 +-
test/testcases/newfeatures | 2 +
test/testcases/newfeatures.exp | 11 +-
test/testcases/node.exp | 20 +-
test/testcases/ra.exp | 10 +-
test/testcases/resource | 6 +
test/testcases/resource.exp | 251 +-
test/testcases/rset-xml.exp | 2 +-
test/testcases/scripts | 12 +
test/testcases/scripts.exp | 273 ++
test/testcases/scripts.filter | 4 +
test/testcases/shadow.exp | 8 +-
test/unit-tests.sh | 13 -
test/unittests/__init__.py | 25 +-
test/unittests/scripts/inc1/main.yml | 22 +
test/unittests/scripts/inc2/main.yml | 26 +
.../unittests/scripts/legacy}/main.yml | 0
test/unittests/scripts/templates/apache.xml | 36 +
test/unittests/scripts/templates/virtual-ip.xml | 62 +
test/unittests/scripts/unified/main.yml | 26 +
test/unittests/scripts/v2/main.yml | 46 +
test/unittests/scripts/vip/main.yml | 28 +
test/unittests/scripts/vipinc/main.yml | 14 +
test/unittests/scripts/workflows/10-webserver.xml | 50 +
test/unittests/test_bugs.py | 538 ++-
test/unittests/test_cib.py | 27 +-
test/unittests/test_cliformat.py | 72 +-
test/unittests/test_corosync.py | 30 +-
test/unittests/test_gv.py | 26 +
test/unittests/test_handles.py | 166 +
test/unittests/test_objset.py | 34 +-
test/unittests/test_parse.py | 52 +-
test/unittests/test_resource.py | 19 +-
test/unittests/test_scripts.py | 826 ++++
test/unittests/test_time.py | 17 +
test/unittests/test_utils.py | 21 +-
scripts/add/Makefile.am => update-data-manifest.sh | 30 +-
utils/Makefile.am | 27 -
utils/crm_init.py | 4 +-
utils/crm_pkg.py | 22 +-
utils/crm_rpmcheck.py | 16 +-
version.in | 1 -
272 files changed, 16040 insertions(+), 7279 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