diff --git a/ChangeLog b/ChangeLog index debee983a37..fea5f5e987a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,7 @@ -* Wed Nov 16 2016 Ken Gaillot Pacemaker-1.1.16-1 -- Update source tarball to revision: a145ce1 -- Changesets: 9 -- Diff: 12 files changed, 40 insertions(+), 56 deletions(-) - -- Changes since Pacemaker-1.1.16-rc1 - + Fix minor build issue - + Correct license specified for some library source files to LGPL - + systemd: order pacemaker after time-sync target - - -* Thu Nov 03 2016 Ken Gaillot Pacemaker-1.1.16-rc1 -- Update source tarball to revision: 2fc4716 -- Changesets: 360 -- Diff: 148 files changed, 7187 insertions(+), 5592 deletions(-) +* Wed Nov 30 2016 Ken Gaillot Pacemaker-1.1.16-1 +- Update source tarball to revision: 76876b3 +- Changesets: 382 +- Diff: 145 files changed, 7200 insertions(+), 5621 deletions(-) - Features added since Pacemaker-1.1.15 + Location constraints may use rsc-pattern, with submatches expanded @@ -53,6 +42,7 @@ + resources: ping - avoid temporary files for fping check, support FreeBSD + resources: SysInfo - better support for FreeBSD + resources: variable name typo in docker-wrapper + + systemd: order pacemaker after time-sync target + tools: correct attrd_updater help and error messages when using CMAN + tools: crm_standby --version/--help should work without cluster running + tools: make crm_report sanitize CIB before generating readable version diff --git a/GNUmakefile b/GNUmakefile index 023b5c60800..8c6a09e7800 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -69,6 +69,13 @@ COUNT = $(shell expr 1 + $(LAST_COUNT)) SPECVERSION ?= $(COUNT) +# toplevel rsync destination for www targets (without trailing slash) +RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html + +# recursive, preserve symlinks/permissions/times, verbose, compress, +# don't cross filesystems, sparse, show progress +RSYNC_OPTS = -rlptvzxS --progress + # rpmbuild wrapper that translates "--with[out] FEATURE" into RPM macros # # Unfortunately, at least recent versions of rpm do not support mentioned @@ -254,7 +261,7 @@ dirty: make TAG=dirty mock COVERITY_DIR = $(shell pwd)/coverity-$(TAG) -COVFILE = pacemaker-coverity-$(TAG).tgz +COVFILE = $(PACKAGE)-coverity-$(TAG).tgz COVHOST ?= scan5.coverity.com COVPASS ?= password @@ -280,7 +287,7 @@ coverity-corp: cov-analyze --dir $(COVERITY_DIR) --wait-for-license cov-format-errors --dir $(COVERITY_DIR) --emacs-style > $(TAG).coverity cov-format-errors --dir $(COVERITY_DIR) - rsync -avzxlSD --progress $(COVERITY_DIR)/c/output/errors/ root@www.clusterlabs.org:/var/www/html/coverity/$(PACKAGE)/$(TAG) + rsync $(RSYNC_OPTS) "$(COVERITY_DIR)/c/output/errors/" "$(RSYNC_DEST)/coverity/$(PACKAGE)/$(TAG)" make core-clean # cov-commit-defects --host $(COVHOST) --dir $(COVERITY_DIR) --stream $(PACKAGE) --user auto --password $(COVPASS) rm -rf $(COVERITY_DIR) @@ -291,12 +298,12 @@ global: clean-generic %.8.html: %.8 echo groff -mandoc `man -w ./$<` -T html > $@ groff -mandoc `man -w ./$<` -T html > $@ - rsync -azxlSD --progress $@ root@www.clusterlabs.org:/var/www/html/man/ + rsync $(RSYNC_OPTS) "$@" "$(RSYNC_DEST)/man/$(PACKAGE)/" %.7.html: %.7 echo groff -mandoc `man -w ./$<` -T html > $@ groff -mandoc `man -w ./$<` -T html > $@ - rsync -azxlSD --progress $@ root@www.clusterlabs.org:/var/www/html/man/ + rsync $(RSYNC_OPTS) "$@" "$(RSYNC_DEST)/man/$(PACKAGE)/" doxygen: Doxyfile doxygen Doxyfile @@ -307,13 +314,11 @@ abi-www: abi-check -u pacemaker $(LAST_RELEASE) $(TAG) www: all global doxygen - find . -name "[a-z]*.8" -exec make \{\}.html \; - find . -name "[a-z]*.7" -exec make \{\}.html \; + find . -name "[a-z]*.[78]" -exec make \{\}.html \; htags -sanhIT - rsync -avzxlSD --progress HTML/ root@www.clusterlabs.org:/var/www/html/global/$(PACKAGE)/$(TAG) - rsync -avzxlSD --progress doc/api/html/ root@www.clusterlabs.org:/var/www/html/doxygen/$(PACKAGE)/$(TAG) - make -C doc www - make coverity + rsync $(RSYNC_OPTS) HTML/ "$(RSYNC_DEST)/global/$(PACKAGE)/$(TAG)" + rsync $(RSYNC_OPTS) doc/api/html/ "$(RSYNC_DEST)/doxygen/$(PACKAGE)/$(TAG)" + make RSYNC_DEST=$(RSYNC_DEST) -C doc www summary: @printf "\n* `date +"%a %b %d %Y"` `git config user.name` <`git config user.email`> $(NEXT_RELEASE)-1" diff --git a/doc/Makefile.am b/doc/Makefile.am index a97c2f187c7..ceeb9f00e40 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -28,8 +28,12 @@ docbook = Clusters_from_Scratch \ Pacemaker_Remote doc_DATA = $(ascii) $(generated_docs) -# rsync destination for www targets -RSYNC_DEST = root@www.clusterlabs.org:/var/www/html/doc/ +# toplevel rsync destination for www targets (without trailing slash) +RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html/ + +# recursive, preserve symlinks/permissions/times, verbose, compress, +# don't cross filesystems, sparse, show progress +RSYNC_OPTS = -rlptvzxS --progress publican_docs = generated_docs = @@ -255,7 +259,7 @@ pdf: www: clean-local $(generated_docs) $(ascii) make www-cli - rsync -rtz --progress $(generated_docs) $(ascii) $(asciiman) $(RSYNC_DEST) + rsync $(RSYNC_OPTS) $(generated_docs) $(ascii) $(asciiman) "$(RSYNC_DEST)/doc/" www-pcs: www-cli @@ -274,7 +278,7 @@ if BUILD_DOCBOOK mv $$book/publish/$$lang/Pacemaker/$(PACKAGE_SERIES)-$(ASCIIDOC_CLI_TYPE)/epub/$$book/Pacemaker-1.1{-$(ASCIIDOC_CLI_TYPE),}-$$book-$$lang.epub; \ mv $$book/publish/$$lang/Pacemaker/$(PACKAGE_SERIES)-$(ASCIIDOC_CLI_TYPE)/pdf/$$book/Pacemaker-1.1{-$(ASCIIDOC_CLI_TYPE),}-$$book-$$lang.pdf; \ done; \ - rsync -rtz --progress $$book/publish/* $(RSYNC_DEST); \ + rsync $(RSYNC_OPTS) $$book/publish/* "$(RSYNC_DEST)/doc/"; \ sed -i.sed 's@version:.*@version: $(PACKAGE_SERIES)@' $$book/publican.cfg; \ done endif diff --git a/doc/Pacemaker_Explained/en-US/Ch-Rules.txt b/doc/Pacemaker_Explained/en-US/Ch-Rules.txt index dbd970b6943..3b87fdfac00 100644 --- a/doc/Pacemaker_Explained/en-US/Ch-Rules.txt +++ b/doc/Pacemaker_Explained/en-US/Ch-Rules.txt @@ -139,13 +139,6 @@ special, built-in node attributes for each node that can also be used. unrelated to the now-common use of "container" for resource isolation). '(since 1.1.13)' -|#ra-version -|The installed version of the resource agent on the node, as defined - by the +version+ attribute of the +resource-agent+ tag in the agent's - metadata. Valid only within rules controlling resource options. This can be - useful during rolling upgrades of a backward-incompatible resource agent. - '(coming in 1.1.17)' - |========================================================= == Time- and Date-Based Expressions ==