Updated nginx to 1.11.13.
diff --git a/debian/Makefile b/debian/Makefile index 43bbb5b..452f48e 100644 --- a/debian/Makefile +++ b/debian/Makefile
@@ -1,9 +1,9 @@ SHELL= /bin/bash -BASE_VERSION= 1.11.12 +BASE_VERSION= 1.11.13 BASE_RELEASE= 1 -BASE_PREV= 1.11.11 -BASE_NEXT= 1.11.13 +BASE_PREV= 1.11.12 +BASE_NEXT= 1.11.14 BASE_SRC= nginx-$(BASE_VERSION).tar.gz SRCDIR= nginx-$(BASE_VERSION) SRCPATH?= ../..
diff --git a/debian/nginx-module-geoip.changelog.in b/debian/nginx-module-geoip.changelog.in index 5c0c8c3..f6e3e99 100644 --- a/debian/nginx-module-geoip.changelog.in +++ b/debian/nginx-module-geoip.changelog.in
@@ -1,5 +1,11 @@ nginx-module-geoip (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low + * base version updated to 1.11.13-1 + + -- Konstantin Pavlov <thresh@nginx.com> Tue, 04 Apr 2017 13:58:59 +0300 + +nginx-module-geoip (1.11.12-1~%%CODENAME%%) %%CODENAME%%; urgency=low + * base version updated to 1.11.12-1 -- Konstantin Pavlov <thresh@nginx.com> Fri, 24 Mar 2017 16:50:23 +0300
diff --git a/debian/nginx-module-image-filter.changelog.in b/debian/nginx-module-image-filter.changelog.in index 1e4d949..4d0bcd9 100644 --- a/debian/nginx-module-image-filter.changelog.in +++ b/debian/nginx-module-image-filter.changelog.in
@@ -1,6 +1,12 @@ nginx-module-image-filter (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low - * base version updated to 1.1.12-1 + * base version updated to 1.11.13-1 + + -- Konstantin Pavlov <thresh@nginx.com> Tue, 04 Apr 2017 13:59:32 +0300 + +nginx-module-image-filter (1.11.12-1~%%CODENAME%%) %%CODENAME%%; urgency=low + + * base version updated to 1.11.12-1 -- Konstantin Pavlov <thresh@nginx.com> Fri, 24 Mar 2017 16:51:01 +0300
diff --git a/debian/nginx-module-perl.changelog.in b/debian/nginx-module-perl.changelog.in index 7ae49c9..9bc7d29 100644 --- a/debian/nginx-module-perl.changelog.in +++ b/debian/nginx-module-perl.changelog.in
@@ -1,5 +1,11 @@ nginx-module-perl (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low + * base version updated to 1.11.13-1 + + -- Konstantin Pavlov <thresh@nginx.com> Tue, 04 Apr 2017 14:00:06 +0300 + +nginx-module-perl (1.11.12-1~%%CODENAME%%) %%CODENAME%%; urgency=low + * base version updated to 1.11.12-1 -- Konstantin Pavlov <thresh@nginx.com> Fri, 24 Mar 2017 16:52:27 +0300
diff --git a/debian/nginx-module-xslt.changelog.in b/debian/nginx-module-xslt.changelog.in index b04d0df..24e0b62 100644 --- a/debian/nginx-module-xslt.changelog.in +++ b/debian/nginx-module-xslt.changelog.in
@@ -1,5 +1,11 @@ nginx-module-xslt (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low + * base version updated to 1.11.13-1 + + -- Konstantin Pavlov <thresh@nginx.com> Tue, 04 Apr 2017 14:00:32 +0300 + +nginx-module-xslt (1.11.12-1~%%CODENAME%%) %%CODENAME%%; urgency=low + * base version updated to 1.11.12-1 -- Konstantin Pavlov <thresh@nginx.com> Fri, 24 Mar 2017 16:52:52 +0300
diff --git a/debian/nginx.changelog.in b/debian/nginx.changelog.in index 843e21a..e3ecc88 100644 --- a/debian/nginx.changelog.in +++ b/debian/nginx.changelog.in
@@ -1,5 +1,12 @@ nginx (%%MAIN_VERSION%%-%%MAIN_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low + * 1.11.13 + * Made upgrade loops/timeouts configurable via /etc/defaults/nginx. + + -- Konstantin Pavlov <thresh@nginx.com> Tue, 04 Apr 2017 13:58:14 +0300 + +nginx (1.11.12-1~%%CODENAME%%) %%CODENAME%%; urgency=low + * 1.11.12 -- Konstantin Pavlov <thresh@nginx.com> Fri, 24 Mar 2017 16:47:12 +0300
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile index dab1224..aa9326e 100644 --- a/rpm/SPECS/Makefile +++ b/rpm/SPECS/Makefile
@@ -1,6 +1,6 @@ SHELL= /bin/bash -BASE_VERSION= 1.11.12 +BASE_VERSION= 1.11.13 BASE_RELEASE= 1 BASE_SRC= nginx-$(BASE_VERSION).tar.gz SRCPATH?= ../SOURCES
diff --git a/rpm/SPECS/nginx-module.changelog.in b/rpm/SPECS/nginx-module.changelog.in index 17d044b..669a416 100644 --- a/rpm/SPECS/nginx-module.changelog.in +++ b/rpm/SPECS/nginx-module.changelog.in
@@ -1,5 +1,8 @@ # default changelog for module packages # +* Tue Apr 4 2017 Konstantin Pavlov <thresh@nginx.com> +- base version updated to 1.11.13 + * Fri Mar 24 2017 Konstantin Pavlov <thresh@nginx.com> - base version updated to 1.11.12
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in index ee8fd6e..07f1bd6 100644 --- a/rpm/SPECS/nginx.spec.in +++ b/rpm/SPECS/nginx.spec.in
@@ -308,6 +308,12 @@ fi %changelog +* Tue Apr 4 2017 Konstantin Pavlov <thresh@nginx.com> +- 1.11.13 +- CentOS7/RHEL7: made upgrade loops/timeouts configurable via + /etc/sysconfig/nginx. +- Bumped upgrade defaults to five loops one second each. + * Fri Mar 24 2017 Konstantin Pavlov <thresh@nginx.com> - 1.11.12