[zookeeper] 09/10: Merge tag 'upstream/3.4.6'

[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 4c2cd471adf1db6cd69b5e3eaf6d0229bc4af0d5
Merge: 8198958 99c9027
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 26 13:35:44 2015 +0100

    Merge tag 'upstream/3.4.6'
    
    Upstream version 3.4.6

 src/contrib/loggraph/README.txt                    |   69 -
 src/contrib/loggraph/bin/loggraph-dev.sh           |   43 -
 src/contrib/loggraph/bin/loggraph.sh               |   48 -
 src/contrib/loggraph/build.xml                     |   70 -
 src/contrib/loggraph/ivy.xml                       |   44 -
 .../apache/zookeeper/graph/FilterException.java    |   22 -
 .../java/org/apache/zookeeper/graph/FilterOp.java  |   75 -
 .../org/apache/zookeeper/graph/FilterParser.java   |  131 -
 .../org/apache/zookeeper/graph/JsonGenerator.java  |  223 --
 .../org/apache/zookeeper/graph/Log4JEntry.java     |   40 -
 .../org/apache/zookeeper/graph/Log4JSource.java    |  381 ---
 .../java/org/apache/zookeeper/graph/LogEntry.java  |   46 -
 .../org/apache/zookeeper/graph/LogIterator.java    |   26 -
 .../java/org/apache/zookeeper/graph/LogServer.java |   66 -
 .../org/apache/zookeeper/graph/LogSkipList.java    |   95 -
 .../java/org/apache/zookeeper/graph/LogSource.java |   33 -
 .../apache/zookeeper/graph/MeasureThroughput.java  |  103 -
 .../apache/zookeeper/graph/MergedLogSource.java    |  219 --
 .../zookeeper/graph/RandomAccessFileReader.java    |  328 --
 .../apache/zookeeper/graph/TransactionEntry.java   |   59 -
 .../org/apache/zookeeper/graph/TxnLogSource.java   |  376 ---
 .../apache/zookeeper/graph/filterops/AndOp.java    |   33 -
 .../org/apache/zookeeper/graph/filterops/Arg.java  |   36 -
 .../apache/zookeeper/graph/filterops/EqualsOp.java |   44 -
 .../zookeeper/graph/filterops/GreaterThanOp.java   |   70 -
 .../zookeeper/graph/filterops/LessThanOp.java      |   69 -
 .../apache/zookeeper/graph/filterops/NotOp.java    |   31 -
 .../zookeeper/graph/filterops/NumberArg.java       |   28 -
 .../org/apache/zookeeper/graph/filterops/OrOp.java |   33 -
 .../zookeeper/graph/filterops/StringArg.java       |   28 -
 .../zookeeper/graph/filterops/SymbolArg.java       |   27 -
 .../apache/zookeeper/graph/filterops/XorOp.java    |   40 -
 .../zookeeper/graph/servlets/FileLoader.java       |   60 -
 .../org/apache/zookeeper/graph/servlets/Fs.java    |   69 -
 .../apache/zookeeper/graph/servlets/GraphData.java |   85 -
 .../zookeeper/graph/servlets/JsonServlet.java      |   85 -
 .../apache/zookeeper/graph/servlets/NumEvents.java |   87 -
 .../zookeeper/graph/servlets/StaticContent.java    |   50 -
 .../zookeeper/graph/servlets/Throughput.java       |  125 -
 .../org/apache/zookeeper/graph/log4j.properties    |   11 -
 .../zookeeper/graph/resources/date.format.js       |  126 -
 .../org/apache/zookeeper/graph/resources/g.bar.js  |  385 ---
 .../org/apache/zookeeper/graph/resources/g.dot.js  |  110 -
 .../org/apache/zookeeper/graph/resources/g.line.js |  230 --
 .../org/apache/zookeeper/graph/resources/g.pie.js  |  205 --
 .../apache/zookeeper/graph/resources/g.raphael.js  |  481 ---
 .../apache/zookeeper/graph/resources/load-big.gif  |  Bin 1924 -> 0 bytes
 .../org/apache/zookeeper/graph/resources/load.gif  |  Bin 673 -> 0 bytes
 .../apache/zookeeper/graph/resources/loggraph.css  |   54 -
 .../apache/zookeeper/graph/resources/loggraph.js   |  262 --
 .../zookeeper/graph/resources/loggraph.log.js      |   57 -
 .../zookeeper/graph/resources/loggraph.server.js   |  329 --
 .../zookeeper/graph/resources/loggraph.session.js  |  202 --
 .../zookeeper/graph/resources/loggraph.stats.js    |   44 -
 .../zookeeper/graph/resources/loggraph.ui.js       |  377 ---
 .../org/apache/zookeeper/graph/resources/main.html |   60 -
 .../apache/zookeeper/graph/resources/raphael.js    | 3296 --------------------
 .../apache/zookeeper/graph/resources/yui-min.js    |   12 -
 58 files changed, 9738 deletions(-)

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