[tomcat7] 03/04: Merge tag 'upstream/7.0.75'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 1e7a94dde8d43c6d58e5e4a89ed33d8c845bf5c4
Merge: e5d02a1 2df0b63
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 24 13:11:55 2017 +0100

    Merge tag 'upstream/7.0.75'
    
    Upstream version 7.0.75

 build.properties.default                            |  2 +-
 .../apache/catalina/ha/session/BackupManager.java   | 15 +++++++++++++++
 .../catalina/ha/session/mbeans-descriptors.xml      |  4 ++++
 .../org/apache/catalina/manager/host/Constants.java | 10 +++++-----
 res/maven/mvn.properties.default                    |  2 +-
 webapps/docs/changelog.xml                          | 21 ++++++++++++++++++++-
 webapps/docs/config/cluster-manager.xml             |  5 +++++
 webapps/docs/tomcat-docs.xsl                        |  2 +-
 8 files changed, 52 insertions(+), 9 deletions(-)

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