[tomcat-native] 02/08: Merge tag 'upstream/1.2.1'

[Emmanuel Bourg]

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

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

commit 0623536b9cfa13b24ef3e6745268cf0e23f2d65b
Merge: 652ab03 3d1df59
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 2 18:01:58 2015 +0100

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 CHANGELOG.txt                           |   19 +-
 README.txt                              |    2 +-
 build.properties.default                |    3 +-
 build.xml                               |   15 +-
 docs/index.html                         |   15 +-
 docs/miscellaneous/changelog.html       |   34 +-
 docs/news/2008.html                     |   28 +
 docs/news/{2015.html => 2009.html}      |   14 +-
 docs/news/{2015.html => 2010.html}      |   19 +-
 docs/news/{2015.html => 2011.html}      |   15 +-
 docs/news/2012.html                     |   23 +
 docs/news/2013.html                     |   26 +
 docs/news/2014.html                     |   23 +
 docs/news/2015.html                     |   11 +-
 java/org/apache/tomcat/jni/Library.java |   15 +-
 jnirelease.sh                           |    2 +-
 native/BUILDING                         |   18 +-
 native/build-outputs.mk                 |   62 ++
 native/build/apr_common.m4              |  990 +++++++++++++++++
 native/build/config.guess               | 1420 ++++++++++++++++++++++++
 native/build/config.sub                 | 1799 +++++++++++++++++++++++++++++++
 native/build/find_apr.m4                |  202 ++++
 native/build/install.sh                 |  112 ++
 native/build/rpm/tcnative.spec.in       |   19 +-
 native/buildconf                        |   65 +-
 native/configure                        |  736 ++++++++++++-
 native/include/tcn_version.h            |    2 +-
 native/libtcnative.dsp                  |    4 +-
 native/os/win32/libtcnative.rc          |   11 +-
 native/src/ssl.c                        |    1 -
 native/src/sslcontext.c                 |   33 +-
 native/src/sslnetwork.c                 |   10 +-
 native/src/sslutils.c                   |    1 +
 native/tcnative.dsp                     |    4 +-
 native/tcnative.spec                    |   21 +-
 xdocs/index.xml                         |   13 +-
 xdocs/miscellaneous/changelog.xml       |   34 +-
 xdocs/miscellaneous/project.xml         |    7 +
 xdocs/news/2008.xml                     |   57 +
 xdocs/news/{2015.xml => 2009.xml}       |   18 +-
 xdocs/news/{2015.xml => 2010.xml}       |   23 +-
 xdocs/news/{2015.xml => 2011.xml}       |   19 +-
 xdocs/news/{2015.xml => 2012.xml}       |   29 +-
 xdocs/news/2013.xml                     |   55 +
 xdocs/news/{2015.xml => 2014.xml}       |   23 +-
 xdocs/news/2015.xml                     |    9 +-
 xdocs/news/project.xml                  |    7 +
 xdocs/project.xml                       |    7 +
 48 files changed, 5878 insertions(+), 197 deletions(-)

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