Codebase list pacemaker / bf92741
Merge tag 'upstream/1.1.16' into debian/experimental Upstream version 1.1.16 Ferenc Wágner 7 years ago
6 changed file(s) with 34 addition(s) and 43 deletion(s). Raw diff Collapse all Expand all
+5
-15
ChangeLog less more
0 * Wed Nov 16 2016 Ken Gaillot <kgaillot@redhat.com> Pacemaker-1.1.16-1
1 - Update source tarball to revision: a145ce1
2 - Changesets: 9
3 - Diff: 12 files changed, 40 insertions(+), 56 deletions(-)
4
5 - Changes since Pacemaker-1.1.16-rc1
6 + Fix minor build issue
7 + Correct license specified for some library source files to LGPL
8 + systemd: order pacemaker after time-sync target
9
10
11 * Thu Nov 03 2016 Ken Gaillot <kgaillot@redhat.com> Pacemaker-1.1.16-rc1
12 - Update source tarball to revision: 2fc4716
13 - Changesets: 360
14 - Diff: 148 files changed, 7187 insertions(+), 5592 deletions(-)
0 * Wed Nov 30 2016 Ken Gaillot <kgaillot@redhat.com> Pacemaker-1.1.16-1
1 - Update source tarball to revision: 76876b3
2 - Changesets: 382
3 - Diff: 145 files changed, 7200 insertions(+), 5621 deletions(-)
154
165 - Features added since Pacemaker-1.1.15
176 + Location constraints may use rsc-pattern, with submatches expanded
5241 + resources: ping - avoid temporary files for fping check, support FreeBSD
5342 + resources: SysInfo - better support for FreeBSD
5443 + resources: variable name typo in docker-wrapper
44 + systemd: order pacemaker after time-sync target
5545 + tools: correct attrd_updater help and error messages when using CMAN
5646 + tools: crm_standby --version/--help should work without cluster running
5747 + tools: make crm_report sanitize CIB before generating readable version
+19
-15
GNUmakefile less more
6868
6969 SPECVERSION ?= $(COUNT)
7070
71 # toplevel rsync destination for www targets (without trailing slash)
72 RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html
73
74 # recursive, preserve symlinks/permissions/times, verbose, compress,
75 # don't cross filesystems, sparse, show progress
76 RSYNC_OPTS = -rlptvzxS --progress
77
7178 # rpmbuild wrapper that translates "--with[out] FEATURE" into RPM macros
7279 #
7380 # Unfortunately, at least recent versions of rpm do not support mentioned
94101 eval set -- "$${WITH}"; \
95102 while true; do \
96103 case "$$1" in \
97 --with) CMD="$${CMD} --define \"_with_$$2 --with-$$2\""; shift 2; \
98 [ "$$2" != pre_release ] || PREREL=1;; \
99 --without) CMD="$${CMD} --define \"_without_$$2 --without-$$2\""; shift 2; \
100 [ "$$2" != pre_release ] || PREREL=0;; \
104 --with) CMD="$${CMD} --define \"_with_$$2 --with-$$2\""; \
105 [ "$$2" != pre_release ] || PREREL=1; shift 2;; \
106 --without) CMD="$${CMD} --define \"_without_$$2 --without-$$2\""; \
107 [ "$$2" != pre_release ] || PREREL=0; shift 2;; \
101108 --) shift ; break ;; \
102109 *) echo "cannot parse WITH: $$1"; exit 1;; \
103110 esac; \
186193 fi
187194 sed -i 's/global\ specversion.*/global\ specversion\ $(SPECVERSION)/' $(PACKAGE).spec
188195 sed -i 's/global\ commit.*/global\ commit\ $(TAG)/' $(PACKAGE).spec
189 @WITH=$$(getopt -o "" -l with:,without: -n '$@' -- $(WITH)) || exit 1; \
190196 $(call rpmbuild-with,$(WITH),-bs --define "dist .$*" $(RPM_OPTS),$(PACKAGE).spec)
191197
192198 chroot: mock-$(MOCK_CFG) mock-install-$(MOCK_CFG) mock-sh-$(MOCK_CFG)
254260 make TAG=dirty mock
255261
256262 COVERITY_DIR = $(shell pwd)/coverity-$(TAG)
257 COVFILE = pacemaker-coverity-$(TAG).tgz
263 COVFILE = $(PACKAGE)-coverity-$(TAG).tgz
258264 COVHOST ?= scan5.coverity.com
259265 COVPASS ?= password
260266
280286 cov-analyze --dir $(COVERITY_DIR) --wait-for-license
281287 cov-format-errors --dir $(COVERITY_DIR) --emacs-style > $(TAG).coverity
282288 cov-format-errors --dir $(COVERITY_DIR)
283 rsync -avzxlSD --progress $(COVERITY_DIR)/c/output/errors/ root@www.clusterlabs.org:/var/www/html/coverity/$(PACKAGE)/$(TAG)
289 rsync $(RSYNC_OPTS) "$(COVERITY_DIR)/c/output/errors/" "$(RSYNC_DEST)/coverity/$(PACKAGE)/$(TAG)"
284290 make core-clean
285291 # cov-commit-defects --host $(COVHOST) --dir $(COVERITY_DIR) --stream $(PACKAGE) --user auto --password $(COVPASS)
286292 rm -rf $(COVERITY_DIR)
291297 %.8.html: %.8
292298 echo groff -mandoc `man -w ./$<` -T html > $@
293299 groff -mandoc `man -w ./$<` -T html > $@
294 rsync -azxlSD --progress $@ root@www.clusterlabs.org:/var/www/html/man/
300 rsync $(RSYNC_OPTS) "$@" "$(RSYNC_DEST)/man/$(PACKAGE)/"
295301
296302 %.7.html: %.7
297303 echo groff -mandoc `man -w ./$<` -T html > $@
298304 groff -mandoc `man -w ./$<` -T html > $@
299 rsync -azxlSD --progress $@ root@www.clusterlabs.org:/var/www/html/man/
305 rsync $(RSYNC_OPTS) "$@" "$(RSYNC_DEST)/man/$(PACKAGE)/"
300306
301307 doxygen: Doxyfile
302308 doxygen Doxyfile
307313 abi-check -u pacemaker $(LAST_RELEASE) $(TAG)
308314
309315 www: all global doxygen
310 find . -name "[a-z]*.8" -exec make \{\}.html \;
311 find . -name "[a-z]*.7" -exec make \{\}.html \;
316 find . -name "[a-z]*.[78]" -exec make \{\}.html \;
312317 htags -sanhIT
313 rsync -avzxlSD --progress HTML/ root@www.clusterlabs.org:/var/www/html/global/$(PACKAGE)/$(TAG)
314 rsync -avzxlSD --progress doc/api/html/ root@www.clusterlabs.org:/var/www/html/doxygen/$(PACKAGE)/$(TAG)
315 make -C doc www
316 make coverity
318 rsync $(RSYNC_OPTS) HTML/ "$(RSYNC_DEST)/global/$(PACKAGE)/$(TAG)"
319 rsync $(RSYNC_OPTS) doc/api/html/ "$(RSYNC_DEST)/doxygen/$(PACKAGE)/$(TAG)"
320 make RSYNC_DEST=$(RSYNC_DEST) -C doc www
317321
318322 summary:
319323 @printf "\n* `date +"%a %b %d %Y"` `git config user.name` <`git config user.email`> $(NEXT_RELEASE)-1"
+1
-1
configure.ac less more
11761176 AC_PATH_PROGS(GIT, git false)
11771177 AC_MSG_CHECKING(build version)
11781178
1179 BUILD_VERSION=c4ca169
1179 BUILD_VERSION=94ff4df
11801180 if test $BUILD_VERSION != ":%h$"; then
11811181 AC_MSG_RESULT(archive hash: $BUILD_VERSION)
11821182
+8
-4
doc/Makefile.am less more
2727 Pacemaker_Remote
2828 doc_DATA = $(ascii) $(generated_docs)
2929
30 # rsync destination for www targets
31 RSYNC_DEST = root@www.clusterlabs.org:/var/www/html/doc/
30 # toplevel rsync destination for www targets (without trailing slash)
31 RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html/
32
33 # recursive, preserve symlinks/permissions/times, verbose, compress,
34 # don't cross filesystems, sparse, show progress
35 RSYNC_OPTS = -rlptvzxS --progress
3236
3337 publican_docs =
3438 generated_docs =
254258
255259 www: clean-local $(generated_docs) $(ascii)
256260 make www-cli
257 rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) $(RSYNC_DEST)
261 rsync $(RSYNC_OPTS) $(generated_docs) $(ascii) $(asciiman) "$(RSYNC_DEST)/doc/"
258262
259263 www-pcs: www-cli
260264
273277 mv $$book/publish/$$lang/Pacemaker/$(PACKAGE_SERIES)-$(ASCIIDOC_CLI_TYPE)/epub/$$book/Pacemaker-1.1{-$(ASCIIDOC_CLI_TYPE),}-$$book-$$lang.epub; \
274278 mv $$book/publish/$$lang/Pacemaker/$(PACKAGE_SERIES)-$(ASCIIDOC_CLI_TYPE)/pdf/$$book/Pacemaker-1.1{-$(ASCIIDOC_CLI_TYPE),}-$$book-$$lang.pdf; \
275279 done; \
276 rsync -rtz --progress $$book/publish/* $(RSYNC_DEST); \
280 rsync $(RSYNC_OPTS) $$book/publish/* "$(RSYNC_DEST)/doc/"; \
277281 sed -i.sed 's@version:.*@version: $(PACKAGE_SERIES)@' $$book/publican.cfg; \
278282 done
279283 endif
+0
-7
doc/Pacemaker_Explained/en-US/Ch-Rules.txt less more
137137 resource, and +container+ for Pacemaker Remote guest nodes (a legacy name
138138 unrelated to the now-common use of "container" for resource isolation).
139139 '(since 1.1.13)'
140
141 |#ra-version
142 |The installed version of the resource agent on the node, as defined
143 by the +version+ attribute of the +resource-agent+ tag in the agent's
144 metadata. Valid only within rules controlling resource options. This can be
145 useful during rolling upgrades of a backward-incompatible resource agent.
146 '(coming in 1.1.17)'
147140
148141 |=========================================================
149142
+1
-1
lib/common/watchdog.c less more
128128
129129 /* We're either pacemakerd, or a pacemaker daemon running as root */
130130
131 if (strcmp("crash", getenv("PCMK_panic_action")) == 0) {
131 if (safe_str_eq("crash", getenv("PCMK_panic_action"))) {
132132 sysrq_trigger('c');
133133 } else {
134134 sysrq_trigger('b');