[Debian-ha-commits] [crmsh] 01/02: Merge tag 'debian/2.3.2-4' into jessie-backports

Christoph Berg myon at debian.org
Wed Jun 7 11:42:35 UTC 2017


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

myon pushed a commit to branch jessie-backports
in repository crmsh.

commit 51f87fd9c057bd25d8ebf7a6619bb0788e42fbb2
Merge: 942ba29 851faf5
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Wed Jun 7 12:32:31 2017 +0200

    Merge tag 'debian/2.3.2-4' into jessie-backports

 .gitignore                                         |    7 +
 .landscape.yaml                                    |   14 +
 .travis.yml                                        |   17 +-
 AUTHORS                                            |    9 +-
 ChangeLog                                          |  114 +
 Makefile.am                                        |   13 +-
 README.md                                          |   33 +-
 configure.ac                                       |    4 +-
 contrib/git-hook-pre-commit                        |   14 +
 contrib/pygments_crmsh_lexers/ansiclr.py           |    5 +-
 contrib/pygments_crmsh_lexers/crmsh.py             |   13 +-
 crm                                                |   29 +-
 crmsh.spec                                         |   44 +-
 {modules => crmsh}/__init__.py                     |    0
 {modules => crmsh}/cache.py                        |    4 +-
 {modules => crmsh}/cibconfig.py                    |  468 ++-
 {modules => crmsh}/cibstatus.py                    |    4 +-
 {modules => crmsh}/cibverify.py                    |    0
 {modules => crmsh}/clidisplay.py                   |   22 +-
 {modules => crmsh}/cliformat.py                    |   26 +-
 {modules => crmsh}/cmd_status.py                   |   37 +-
 {modules => crmsh}/command.py                      |   25 +-
 {modules => crmsh}/completers.py                   |    0
 {modules => crmsh}/config.py                       |   21 +-
 {modules => crmsh}/constants.py                    |   18 +-
 {modules => crmsh}/corosync.py                     |   54 +-
 {modules => crmsh}/crm_gv.py                       |   48 +-
 {modules => crmsh}/crm_pssh.py                     |   34 +-
 {modules => crmsh}/handles.py                      |    4 +-
 {modules => crmsh}/help.py                         |    2 +-
 crmsh/history.py                                   | 1052 +++++
 {modules => crmsh}/idmgmt.py                       |    8 +-
 {modules => crmsh}/log_patterns.py                 |   73 +-
 crmsh/logparser.py                                 |  639 +++
 crmsh/logtime.py                                   |  218 +
 {modules => crmsh}/main.py                         |   13 +-
 {modules => crmsh}/msg.py                          |   44 -
 {modules => crmsh}/options.py                      |    0
 {modules => crmsh}/ordereddict.py                  |  260 +-
 {modules => crmsh}/orderedset.py                   |   14 +-
 {modules => crmsh}/pacemaker.py                    |   16 +-
 {modules => crmsh}/parse.py                        |  936 +++--
 {modules => crmsh}/ra.py                           |   86 +-
 {modules => crmsh}/rsctest.py                      |   12 +-
 {modules => crmsh}/schema.py                       |    6 +-
 {modules => crmsh}/scripts.py                      |  136 +-
 {modules => crmsh}/template.py                     |    0
 {modules => crmsh}/term.py                         |   46 +-
 {modules => crmsh}/tmpfiles.py                     |   21 +-
 {modules => crmsh}/ui_assist.py                    |    0
 {modules => crmsh}/ui_cib.py                       |    2 +-
 {modules => crmsh}/ui_cibstatus.py                 |    0
 {modules => crmsh}/ui_cluster.py                   |    0
 {modules => crmsh}/ui_configure.py                 |   43 +-
 {modules => crmsh}/ui_context.py                   |   22 +-
 {modules => crmsh}/ui_corosync.py                  |    4 +-
 {modules => crmsh}/ui_history.py                   |   49 +-
 {modules => crmsh}/ui_maintenance.py               |    3 +-
 {modules => crmsh}/ui_node.py                      |   38 +-
 {modules => crmsh}/ui_options.py                   |    2 +-
 {modules => crmsh}/ui_ra.py                        |    0
 {modules => crmsh}/ui_report.py                    |    0
 {modules => crmsh}/ui_resource.py                  |   77 +-
 {modules => crmsh}/ui_root.py                      |   13 +
 {modules => crmsh}/ui_script.py                    |   56 +-
 {modules => crmsh}/ui_site.py                      |    0
 {modules => crmsh}/ui_template.py                  |    2 +-
 {modules => crmsh}/ui_utils.py                     |    1 -
 {modules => crmsh}/userdir.py                      |    0
 {modules => crmsh}/utils.py                        |  250 +-
 {modules => crmsh}/xmlutil.py                      |  179 +-
 data-manifest                                      |    6 +
 debian/changelog                                   |   77 +
 debian/control                                     |   31 +-
 debian/copyright                                   |    7 +-
 debian/crmsh.install                               |    2 +-
 ...Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch |   28 -
 debian/patches/0002-Remove-fix-for-Debian.patch    |   31 -
 ...-breach-generic-caused-by-footer-template.patch |    6 +-
 debian/patches/0007-pygmentize-lexer.patch         |   81 +
 debian/patches/0008-Fix-crm-report-for-dash.patch  |  136 +
 debian/patches/0009-Fix-spelling-in-man-crm.patch  |   15 +
 debian/patches/0010-Fix-package-management.patch   |  147 +
 debian/patches/0011-Fix-scripts-init.patch         |   21 +
 debian/patches/0012-Fix-crm-history.patch          |   71 +
 debian/patches/series                              |    8 +-
 debian/rules                                       |   15 +-
 debian/tests/control                               |   23 +
 debian/tests/pacemaker-basic-resource.sh           |   78 +
 debian/tests/pacemaker-node-status.sh              |   60 +
 debian/tests/utils.sh                              |   30 +
 doc/crm.8.adoc                                     |  628 +--
 doc/development.md                                 |  143 +-
 doc/website-v1/Makefile                            |    3 +-
 doc/website-v1/crm.conf                            |   22 +-
 doc/website-v1/css/crm.css                         |  220 +-
 doc/website-v1/development.adoc                    |   35 +-
 doc/website-v1/documentation.adoc                  |   24 +-
 doc/website-v1/download.adoc                       |   44 +
 doc/website-v1/index.adoc                          |   29 +-
 doc/website-v1/installation.adoc                   |   57 +-
 doc/website-v1/man-1.2.adoc                        |    2 +-
 doc/website-v1/man-2.0.adoc                        | 4343 ++++++++++++--------
 doc/website-v1/news.adoc                           |   10 +-
 doc/website-v1/news/2016-01-15-release-2_2_0.adoc  |  210 +
 doc/website-v1/news/2016-04-28-release-2_2_1.adoc  |   73 +
 doc/website-v1/news/2016-08-12-release-2_3_0.adoc  |   76 +
 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                             |   75 +-
 hb_report/utillib.sh                               |   28 +-
 modules/history.py                                 | 1739 --------
 modules/log_patterns_118.py                        |   76 -
 modules/xmlbuilder.py                              |  102 -
 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                          |    7 +-
 scripts/init/basic.cib.template                    |   19 +-
 scripts/init/configure.py                          |   18 +-
 scripts/init/corosync.conf.template                |   15 +-
 scripts/init/init.py                               |    7 +-
 scripts/libvirt/main.yml                           |   11 +-
 scripts/lvm-drbd/main.yml                          |   62 +
 scripts/mailto/main.yml                            |    4 +-
 scripts/nfsserver-lvm-drbd/main.yml                |  137 +
 scripts/nfsserver/main.yml                         |   29 +-
 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-device/main.yml                        |   63 +
 scripts/sbd/main.yml                               |   37 +-
 scripts/vmware/main.yml                            |   60 +
 setup.py                                           |   16 +-
 test/list-undocumented-commands.py                 |   29 +-
 test/profile-history.sh                            |   22 +
 test/testcases/bugs                                |   22 +
 test/testcases/bugs.exp                            |   39 +
 test/testcases/commit.exp                          |    4 +-
 test/testcases/edit.exp                            |    1 -
 test/testcases/history                             |    3 +
 test/testcases/history.exp                         |  158 +-
 test/testcases/newfeatures                         |    9 +
 test/testcases/newfeatures.exp                     |   11 +
 test/testcases/ra.exp                              |   14 +-
 test/testcases/resource                            |    4 +
 test/testcases/resource.exp                        |   47 +
 test/testcases/scripts.exp                         |   63 +-
 test/unittests/test_bugs.py                        |   43 +-
 test/unittests/test_cliformat.py                   |   77 +-
 test/unittests/test_corosync.py                    |   22 +-
 test/unittests/test_gv.py                          |   25 +-
 test/unittests/test_parse.py                       |  209 +-
 test/unittests/test_scripts.py                     |   51 +
 test/unittests/test_time.py                        |   11 +-
 tox.ini                                            |   17 +
 168 files changed, 9866 insertions(+), 6069 deletions(-)

diff --cc .gitignore
index b1cdedc,d1ea3fa..7650a91
--- a/.gitignore
+++ b/.gitignore
@@@ -12,3 -13,11 +13,9 @@@ patches/
  .project
  .settings
  .pydevproject
+ 
+ contrib/build/
+ contrib/dist/
+ contrib/pygments_crmsh_lexers.egg-info/
+ 
+ .tox/
 -
 -.pc
diff --cc debian/changelog
index 2e4592e,b998280..21c758d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,74 +1,86 @@@
++crmsh (2.3.2-4~bpo8+1) jessie-backports; urgency=medium
++
++  * Rebuild for jessie-backports.
++
++ -- Christoph Berg <christoph.berg at credativ.de>  Wed, 07 Jun 2017 12:31:52 +0200
++
+ crmsh (2.3.2-4) unstable; urgency=medium
+ 
+   * Remove uninstall file list
+ 
+  -- Valentin Vidic <Valentin.Vidic at CARNet.hr>  Mon, 19 Dec 2016 10:45:25 +0100
+ 
+ crmsh (2.3.2-3) unstable; urgency=medium
+ 
+   * Make crm.8.html generation reproducible
+   * Cleanup debian/rules
+ 
+  -- Valentin Vidic <Valentin.Vidic at CARNet.hr>  Mon, 12 Dec 2016 10:46:36 +0100
+ 
+ crmsh (2.3.2-2) unstable; urgency=medium
+ 
+   [ Valentin Vidic ]
+   * Use https for Vcs-Browser link (lintian fix)
+   * Update debian/copyright for moved files (lintian fix)
+   * crmsh: Change Architecture to all
+   * Drop unused libraries from build-depends
+   * Make generated documentation reproducible
+   * Remove unused packages from Build-Depends
+   * Fix crm manpage spelling
+   * crmsh-doc: add Multi-Arch: foreign
+   * d/tests: add basic crm node tests
+   * Patch scripts in utils to work on Debian
+   * d/tests: add tests for package management scripts
+   * Add patch to make 'cluster init' work on Debian
+   * Add python-parallax to Depends (Closes: #819545)
+   * Add patch to fix crm history on Debian systems
+ 
+   [ Christoph Berg ]
+   * Remove Martin and myself from Uploaders.
+ 
+  -- Valentin Vidic <Valentin.Vidic at CARNet.hr>  Sun, 04 Dec 2016 18:57:50 +0100
+ 
+ crmsh (2.3.2-1) unstable; urgency=medium
+ 
+   [ Christoph Berg ]
+   * Fix changelog for previous upload, d/tests got lost.
+ 
+   [ Arturo Borrero Gonzalez ]
+   * Refresh 0004-Fix-privacy-breach-generic-caused-by-footer-template.patch
+     patch
+ 
+   [ Valentin Vidic ]
+   * Imported upstream version 2.3.2 (Closes: #815823, #815346)
+   * crm report: add gawk to Depends
+   * crm report: upstream fix for dash (Closes: #772269)
+   * Add myself to Uploaders list
+ 
+  -- Valentin Vidic <Valentin.Vidic at CARNet.hr>  Thu, 03 Nov 2016 10:20:56 +0100
+ 
+ crmsh (2.2.1-1) unstable; urgency=medium
+ 
+   [ Adrian Vondendriesch ]
+   * New upstream release
+   * patches:
+     - drop 0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
+     - drop 0002-Remove-fix-for-Debian.patch
+   * Add myself to uploaders.
+   * Bump standars version.
+ 
+   [ Arturo Borrero Gonzalez ]
+   * d/tests: add basic crm and pacemaker tests
+     Check that the crm utility can run without issues, locating all of the
+     libraries it needs, and check the integration between crmsh and pacemaker
+     (and corosync). We build a cluster and then add a basic IP resource to it.
+ 
+  -- Adrian Vondendriesch <adrian.vondendriesch at credativ.de>  Tue, 03 May 2016 20:05:28 +0200
+ 
 +crmsh (2.2.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Christoph Berg <christoph.berg at credativ.de>  Mon, 14 Mar 2016 15:44:12 +0100
 +
  crmsh (2.2.0-1) unstable; urgency=high
  
    [ Richard B Winters ]

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