[tomcat8] 01/01: Merge branch 'master' of https://anonscm.debian.org/cgit/pkg-java/tomcat8

[Markus Koschany]

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

apo pushed a commit to branch master
in repository tomcat8.

commit 596f1792d933d7a93c718f809484614883c4011b
Merge: 398ed10 7287c82
Author: Markus Koschany <apo at debian.org>
Date:   Tue Aug 2 11:15:57 2016 +0200

    Merge branch 'master' of https://anonscm.debian.org/cgit/pkg-java/tomcat8

 debian/changelog              | 8 ++++++++
 debian/control                | 8 ++++----
 debian/defaults.template      | 4 ++--
 debian/rules                  | 4 ++--
 debian/setenv.sh              | 2 +-
 debian/tomcat8-examples.links | 4 ++--
 debian/tomcat8.config         | 2 +-
 debian/tomcat8.init           | 4 +---
 debian/tomcat8.postinst       | 4 ++--
 debian/tomcat8.templates      | 2 +-
 10 files changed, 24 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index c1feb5d,52e75ea..8693c91
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
 -tomcat8 (8.0.36-2) UNRELEASED; urgency=medium
++tomcat8 (8.0.36-3) UNRELEASED; urgency=medium
+ 
+   * Team upload.
+   * Removed the default 128M heap limit (LP: #568823)
+   * Depend on taglibs-standard instead of jakarta-taglibs-standard
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 21 Jul 2016 14:26:01 +0200
+ 
 +tomcat8 (8.0.36-2) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Do not unconditionally overwrite files in /etc/tomcat8 anymore.
 +    (Closes: #825786)
 +
 + -- Markus Koschany <apo at debian.org>  Tue, 02 Aug 2016 10:50:42 +0200
 +
  tomcat8 (8.0.36-1) unstable; urgency=medium
  
    * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git