[zookeeper] 02/07: Merge tag 'upstream/3.4.8'

[Emmanuel Bourg]

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

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

commit cf87d6478fa3e344e68eaaec5b1788c7bc6d9029
Merge: 43188d5 9503056
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 26 10:04:18 2016 +0100

    Merge tag 'upstream/3.4.8'
    
    Upstream version 3.4.8

 CHANGES.txt                                        |  33 ++++
 bin/zkCli.cmd                                      |  48 ++---
 bin/zkEnv.cmd                                      |  96 +++++-----
 bin/zkServer.cmd                                   |  48 ++---
 bin/zkServer.sh                                    |   2 +-
 build.xml                                          |   2 +-
 ivy.xml                                            |   4 +-
 .../{zookeeper_3.4.7.xml => zookeeper_3.4.8.xml}   |   6 +-
 src/c/configure.ac                                 |   2 +-
 src/c/include/winconfig.h                          |   6 +-
 src/c/include/zookeeper_version.h                  |   2 +-
 src/c/src/zookeeper.c                              |  18 +-
 src/c/zookeeper.sln                                |  50 +++---
 src/contrib/zkfuse/src/zkadapter.cc                |   5 +-
 src/contrib/zooinspector/ivy.xml                   |   4 +-
 src/contrib/zooinspector/zooInspector.cmd          |  34 ++--
 .../documentation/content/xdocs/zookeeperAdmin.xml | 107 +++++++++++
 .../{zookeeper_3.4.7.xml => zookeeper_3.4.8.xml}   |   6 +-
 src/java/main/org/apache/zookeeper/Login.java      |   7 +-
 .../org/apache/zookeeper/server/PurgeTxnLog.java   |  90 ++++++++--
 .../apache/zookeeper/server/ZooKeeperServer.java   |  28 +--
 .../org/apache/zookeeper/server/PurgeTxnTest.java  |  89 ++++++++++
 .../zookeeper/server/ZooKeeperServerMainTest.java  | 196 ++++++++++++++++++++-
 src/lastRevision.bat                               |  46 ++---
 zookeeper-3.4.7.jar.asc                            |  17 --
 zookeeper-3.4.7.jar.md5                            |   1 -
 zookeeper-3.4.7.jar.sha1                           |   1 -
 zookeeper-3.4.8.jar.asc                            |  17 ++
 zookeeper-3.4.8.jar.md5                            |   1 +
 zookeeper-3.4.8.jar.sha1                           |   1 +
 30 files changed, 733 insertions(+), 234 deletions(-)

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