[jackrabbit] 04/08: Merge tag 'upstream/2.12.2'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jackrabbit.

commit 5b7ea5c7c13d78e6315d453c74158c9b7b3880d3
Merge: ebd9378 5f482a6
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 15 06:45:54 2016 +0200

    Merge tag 'upstream/2.12.2'
    
    Upstream version 2.12.2
    
    # gpg: Signature made Fri 15 Jul 2016 06:45:49 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 RELEASE-NOTES.txt                                       | 17 ++++++++++++-----
 jackrabbit-api/pom.xml                                  |  2 +-
 .../jackrabbit/api/stats/RepositoryStatistics.java      |  2 +-
 .../org/apache/jackrabbit/api/stats/TimeSeries.java     |  0
 jackrabbit-aws-ext/pom.xml                              |  2 +-
 jackrabbit-bundle/pom.xml                               |  2 +-
 jackrabbit-core/pom.xml                                 |  2 +-
 .../org/apache/jackrabbit/core/lock/XAEnvironment.java  |  0
 .../org/apache/jackrabbit/core/lock/XALockImpl.java     |  0
 .../org/apache/jackrabbit/core/lock/XALockManager.java  |  0
 .../jackrabbit/core/observation/EventDispatcher.java    |  0
 .../core/observation/EventStateCollectionFactory.java   |  0
 .../core/version/InternalVersionManagerBase.java        |  0
 .../core/version/InternalXAVersionManager.java          |  0
 .../apache/jackrabbit/core/OracleRepositoryTest.java    |  0
 .../core/OracleRetrocompatibleRepositoryTest.java       |  0
 .../apache/jackrabbit/core/OverlappingNodeAddTest.java  |  0
 .../jackrabbit/core/fs/db/OracleFileSystemTest.java     |  0
 .../core/fs/db/OracleRetrocompatibleFileSystemTest.java |  0
 .../jackrabbit/core/version/RestoreNodeWithSNSTest.java |  0
 .../apache/jackrabbit/core/repository-oracle-compat.xml |  0
 .../org/apache/jackrabbit/core/repository-oracle.xml    |  0
 jackrabbit-data/pom.xml                                 |  2 +-
 .../org/apache/jackrabbit/core/data/LocalCache.java     | 11 +++++++++--
 jackrabbit-jca/pom.xml                                  |  2 +-
 jackrabbit-jcr-client/pom.xml                           |  2 +-
 jackrabbit-jcr-commons/pom.xml                          |  2 +-
 .../org/apache/jackrabbit/stats/TimeSeriesRecorder.java |  0
 jackrabbit-jcr-rmi/pom.xml                              |  2 +-
 jackrabbit-jcr-server/pom.xml                           |  2 +-
 jackrabbit-jcr-servlet/pom.xml                          |  2 +-
 jackrabbit-jcr-tests/pom.xml                            |  2 +-
 jackrabbit-jcr2dav/pom.xml                              |  2 +-
 jackrabbit-jcr2spi/pom.xml                              |  2 +-
 jackrabbit-parent/pom.xml                               | 10 +++++-----
 jackrabbit-spi-commons/pom.xml                          |  2 +-
 jackrabbit-spi/pom.xml                                  |  2 +-
 jackrabbit-spi2dav/pom.xml                              |  2 +-
 jackrabbit-spi2jcr/pom.xml                              |  2 +-
 jackrabbit-standalone/pom.xml                           |  2 +-
 jackrabbit-webapp/pom.xml                               |  2 +-
 jackrabbit-webdav/pom.xml                               |  2 +-
 pom.xml                                                 |  8 ++++----
 test/performance/plot.sh                                |  0
 44 files changed, 52 insertions(+), 38 deletions(-)

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