flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r953472 [4/5] - in /websites/staging/flume/trunk/content: ./ .doctrees/ .doctrees/releases/ _sources/ _sources/releases/ releases/
Date Mon, 01 Jun 2015 19:50:48 GMT
Added: websites/staging/flume/trunk/content/_sources/releases/1.6.0.txt
==============================================================================
--- websites/staging/flume/trunk/content/_sources/releases/1.6.0.txt (added)
+++ websites/staging/flume/trunk/content/_sources/releases/1.6.0.txt Mon Jun  1 19:50:47 2015
@@ -0,0 +1,140 @@
+===============
+Version 1.6.0
+===============
+
+.. rubric:: Status of this release
+
+Apache Flume 1.6.0 is the ninth release of Flume as an Apache top-level project
+(TLP). Apache Flume 1.6.0 is production-ready software.
+
+.. rubric:: Release Documentation
+
+* `Flume 1.6.0 User Guide <content/1.6.0/FlumeUserGuide.html>`__ (also in `pdf <content/1.6.0/FlumeUserGuide.pdf>`__)
+* `Flume 1.6.0 Developer Guide <content/1.6.0/FlumeDeveloperGuide.html>`__ (also in `pdf <content/1.6.0/FlumeDeveloperGuide.pdf>`__)
+* `Flume 1.6.0 API Documentation <content/1.6.0/apidocs/index.html>`__
+
+.. rubric:: Changes
+
+Release Notes - Flume - Version v1.6.0
+
+** Sub-task
+    * [`FLUME-2250 <https://issues.apache.org/jira/browse/FLUME-2250>`__] - Add support for Kafka Source
+    * [`FLUME-2251 <https://issues.apache.org/jira/browse/FLUME-2251>`__] - Add support for Kafka Sink
+    * [`FLUME-2677 <https://issues.apache.org/jira/browse/FLUME-2677>`__] - Update versions in 1.6.0 branch
+    * [`FLUME-2686 <https://issues.apache.org/jira/browse/FLUME-2686>`__] - Update KEYS file for 1.6 release
+
+** Bug
+    * [`FLUME-1793 <https://issues.apache.org/jira/browse/FLUME-1793>`__] - Unit test TestElasticSearchLogStashEventSerializer fails with IBM JDK
+    * [`FLUME-1934 <https://issues.apache.org/jira/browse/FLUME-1934>`__] - Spoolingdir source exception when reading multiple   zero size files
+    * [`FLUME-2024 <https://issues.apache.org/jira/browse/FLUME-2024>`__] - Add ExecSource flush timeout to Flume User Guide
+    * [`FLUME-2126 <https://issues.apache.org/jira/browse/FLUME-2126>`__] - Problem in elasticsearch sink when the event body is a complex field
+    * [`FLUME-2148 <https://issues.apache.org/jira/browse/FLUME-2148>`__] - Windows : Add  flume-env.ps1
+    * [`FLUME-2214 <https://issues.apache.org/jira/browse/FLUME-2214>`__] - FileChannelIntegrityTool needs documentation in user guide
+    * [`FLUME-2245 <https://issues.apache.org/jira/browse/FLUME-2245>`__] - HDFS files with errors unable to close
+    * [`FLUME-2337 <https://issues.apache.org/jira/browse/FLUME-2337>`__] - export JAVA_HOME in flume-env.sh.template and increase heap size
+    * [`FLUME-2346 <https://issues.apache.org/jira/browse/FLUME-2346>`__] - idLogFileMap in Log can lose track of file ids
+    * [`FLUME-2404 <https://issues.apache.org/jira/browse/FLUME-2404>`__] - Default maxReadBufferBytes might cause OOM and cause scribe source exit
+    * [`FLUME-2408 <https://issues.apache.org/jira/browse/FLUME-2408>`__] - Remove FLUME-1899 from Flume 1.5.0 change log.
+    * [`FLUME-2416 <https://issues.apache.org/jira/browse/FLUME-2416>`__] - Use CodecPool in compressed stream to prevent leak of direct buffers
+    * [`FLUME-2420 <https://issues.apache.org/jira/browse/FLUME-2420>`__] - HDFSEventSink#stop might throw ConcurrentModificationException
+    * [`FLUME-2425 <https://issues.apache.org/jira/browse/FLUME-2425>`__] - FileChannel should trim data and checkpoint directories
+    * [`FLUME-2432 <https://issues.apache.org/jira/browse/FLUME-2432>`__] - Update Kite dependency to 0.15.0
+    * [`FLUME-2438 <https://issues.apache.org/jira/browse/FLUME-2438>`__] - Make Syslog source message body configurable
+    * [`FLUME-2450 <https://issues.apache.org/jira/browse/FLUME-2450>`__] - Improve replay index insertion speed.
+    * [`FLUME-2466 <https://issues.apache.org/jira/browse/FLUME-2466>`__] - Embedded agent name cannot contain spaces
+    * [`FLUME-2470 <https://issues.apache.org/jira/browse/FLUME-2470>`__] - Kafka Sink and Source must use camel case for all configs.
+    * [`FLUME-2472 <https://issues.apache.org/jira/browse/FLUME-2472>`__] - SyslogUtils fails when system locale is not English
+    * [`FLUME-2475 <https://issues.apache.org/jira/browse/FLUME-2475>`__] - toLowerCase/toUpperCase used without Locale parameter to manipulate Enum
+    * [`FLUME-2479 <https://issues.apache.org/jira/browse/FLUME-2479>`__] - Kafka property auto.commit.enable is incorrect for KafkaSource
+    * [`FLUME-2480 <https://issues.apache.org/jira/browse/FLUME-2480>`__] - Typo in file channel exception: "Usable space exhaused"
+    * [`FLUME-2481 <https://issues.apache.org/jira/browse/FLUME-2481>`__] - TestFileChannelEncryption fails with System locale other than en_US
+    * [`FLUME-2482 <https://issues.apache.org/jira/browse/FLUME-2482>`__] - Race condition in File Channels' Log.removeOldLogs
+    * [`FLUME-2486 <https://issues.apache.org/jira/browse/FLUME-2486>`__] - TestExecSource fails on some environments
+    * [`FLUME-2487 <https://issues.apache.org/jira/browse/FLUME-2487>`__] - SyslogParser has rounding errors in timestamp parsing
+    * [`FLUME-2488 <https://issues.apache.org/jira/browse/FLUME-2488>`__] - TestElasticSearchRestClient fails on Oracle JDK 8
+    * [`FLUME-2489 <https://issues.apache.org/jira/browse/FLUME-2489>`__] - Upgrade Apache Curator to 2.6.0
+    * [`FLUME-2492 <https://issues.apache.org/jira/browse/FLUME-2492>`__] - Flume's Kafka Source doesn't account time correctly
+    * [`FLUME-2495 <https://issues.apache.org/jira/browse/FLUME-2495>`__] - Kafka Source may miss events when channel is not available
+    * [`FLUME-2497 <https://issues.apache.org/jira/browse/FLUME-2497>`__] - TCP and UDP syslog sources parsing the timestamp incorrectly
+    * [`FLUME-2500 <https://issues.apache.org/jira/browse/FLUME-2500>`__] - Add a channel that uses Kafka
+    * [`FLUME-2505 <https://issues.apache.org/jira/browse/FLUME-2505>`__] - Test added in FLUME-2502 is flaky
+    * [`FLUME-2517 <https://issues.apache.org/jira/browse/FLUME-2517>`__] - Performance issue: SimpleDateFormat constructor takes 30% of HDFSEventSink.process()
+    * [`FLUME-2525 <https://issues.apache.org/jira/browse/FLUME-2525>`__] - flume should handle a zero byte .flumespool-main.meta file for the spooldir source
+    * [`FLUME-2538 <https://issues.apache.org/jira/browse/FLUME-2538>`__] - TestResettableFileInputStream fails on JDK 8
+    * [`FLUME-2556 <https://issues.apache.org/jira/browse/FLUME-2556>`__] - TestBucketPath.testDateFormatHours fails intermittently
+    * [`FLUME-2557 <https://issues.apache.org/jira/browse/FLUME-2557>`__] - DatasetSink doesn't work with Kerberos
+    * [`FLUME-2560 <https://issues.apache.org/jira/browse/FLUME-2560>`__] - Kafka channel entries missing for output jar generation
+    * [`FLUME-2568 <https://issues.apache.org/jira/browse/FLUME-2568>`__] - Additional fix for TestReliableSpoolingFileEventReader
+    * [`FLUME-2578 <https://issues.apache.org/jira/browse/FLUME-2578>`__] - Kafka source throws NPE if Kafka record has null key
+    * [`FLUME-2586 <https://issues.apache.org/jira/browse/FLUME-2586>`__] - HDFS Sink should have an option to try rename even if close fails
+    * [`FLUME-2592 <https://issues.apache.org/jira/browse/FLUME-2592>`__] - Specify main manifest attribute in flume tools jar
+    * [`FLUME-2594 <https://issues.apache.org/jira/browse/FLUME-2594>`__] - Close Async HBase Client if there are large number of consecutive timeouts
+    * [`FLUME-2595 <https://issues.apache.org/jira/browse/FLUME-2595>`__] - Add option to checkpoint on file channel shutdown
+    * [`FLUME-2624 <https://issues.apache.org/jira/browse/FLUME-2624>`__] - Improve Hive Sink performance
+    * [`FLUME-2626 <https://issues.apache.org/jira/browse/FLUME-2626>`__] - Remove trustmanager-type from Thrift RPC client
+    * [`FLUME-2633 <https://issues.apache.org/jira/browse/FLUME-2633>`__] - Update Kite dependency to 1.0.0
+    * [`FLUME-2639 <https://issues.apache.org/jira/browse/FLUME-2639>`__] - SecureThriftRpcClient client privileged calls throw IllegalAccessError
+    * [`FLUME-2645 <https://issues.apache.org/jira/browse/FLUME-2645>`__] - ipFilter.rules property name is wrong
+    * [`FLUME-2654 <https://issues.apache.org/jira/browse/FLUME-2654>`__] - Memory channel error message related to byteCapacity needs refining
+    * [`FLUME-2657 <https://issues.apache.org/jira/browse/FLUME-2657>`__] - Upgrade to Hive 1.0
+    * [`FLUME-2658 <https://issues.apache.org/jira/browse/FLUME-2658>`__] - Upgrade to Hbase 1.0
+    * [`FLUME-2664 <https://issues.apache.org/jira/browse/FLUME-2664>`__] - Site profile fails due to dependency issues
+    * [`FLUME-2665 <https://issues.apache.org/jira/browse/FLUME-2665>`__] - Update documentation for hdfs.closeTries based on FLUME-2586
+    * [`FLUME-2670 <https://issues.apache.org/jira/browse/FLUME-2670>`__] - Modify dependencies to not pull hadoop/hive related jars
+    * [`FLUME-2673 <https://issues.apache.org/jira/browse/FLUME-2673>`__] - Remove unused import in TestLog
+    * [`FLUME-2678 <https://issues.apache.org/jira/browse/FLUME-2678>`__] - Upgrade xalan to 2.7.2 to take care of CVE-2014-0107 vulnerability
+    * [`FLUME-2679 <https://issues.apache.org/jira/browse/FLUME-2679>`__] - Make hbase-1 the default profile
+
+** Dependency upgrade
+    * [`FLUME-2443 <https://issues.apache.org/jira/browse/FLUME-2443>`__] - org.apache.hadoop.fs.FSDataOutputStream.sync() is deprecated in hadoop 2.4
+
+** Documentation
+    * [`FLUME-1594 <https://issues.apache.org/jira/browse/FLUME-1594>`__] - Document JMX options
+    * [`FLUME-2509 <https://issues.apache.org/jira/browse/FLUME-2509>`__] - Add description for properties in Failover Sink Processor
+    * [`FLUME-2630 <https://issues.apache.org/jira/browse/FLUME-2630>`__] - Update documentation for Thrift Src/Sink SSL support and Kerberos support
+    * [`FLUME-2635 <https://issues.apache.org/jira/browse/FLUME-2635>`__] - Documentation for zookeeper dynamic configuration in flume
+    * [`FLUME-2668 <https://issues.apache.org/jira/browse/FLUME-2668>`__] - Document SecureThriftRpcClient/SecureRpcClientFactory in Flume Developer Guide
+
+** Improvement
+    * [`FLUME-1334 <https://issues.apache.org/jira/browse/FLUME-1334>`__] - Write an startscript for flume agents on Windows
+    * [`FLUME-1491 <https://issues.apache.org/jira/browse/FLUME-1491>`__] - Dynamic configuration from Zookeeper watcher
+    * [`FLUME-1521 <https://issues.apache.org/jira/browse/FLUME-1521>`__] - Document the StressSource
+    * [`FLUME-1710 <https://issues.apache.org/jira/browse/FLUME-1710>`__] - JSONEvent.getBody should not return null
+    * [`FLUME-1920 <https://issues.apache.org/jira/browse/FLUME-1920>`__] - Test case TestFileChannel fails when flume is built from paths containing the string "hadoop"
+    * [`FLUME-2237 <https://issues.apache.org/jira/browse/FLUME-2237>`__] - Example config in User Guide to use same notation for Agent name
+    * [`FLUME-2246 <https://issues.apache.org/jira/browse/FLUME-2246>`__] - event body data size can make it configurable for logger sinker
+    * [`FLUME-2273 <https://issues.apache.org/jira/browse/FLUME-2273>`__] - ElasticSearchSink: Add handling for header substitution in indexName
+    * [`FLUME-2373 <https://issues.apache.org/jira/browse/FLUME-2373>`__] - Enable configuration to switch thrift source serialization protocol
+    * [`FLUME-2385 <https://issues.apache.org/jira/browse/FLUME-2385>`__] - Flume spans log file with "Spooling Directory Source runner has shutdown" messages at INFO level
+    * [`FLUME-2401 <https://issues.apache.org/jira/browse/FLUME-2401>`__] - Optionally Compress Backup Checkpoint
+    * [`FLUME-2439 <https://issues.apache.org/jira/browse/FLUME-2439>`__] - Update DatasetSink for Kite 0.15.0
+    * [`FLUME-2462 <https://issues.apache.org/jira/browse/FLUME-2462>`__] - Remove use of deprecated methods in DatasetSink
+    * [`FLUME-2463 <https://issues.apache.org/jira/browse/FLUME-2463>`__] - Add support for Hive and HBase datasets to DatasetSink
+    * [`FLUME-2469 <https://issues.apache.org/jira/browse/FLUME-2469>`__] - DatasetSink should load dataset when needed, not at startup
+    * [`FLUME-2499 <https://issues.apache.org/jira/browse/FLUME-2499>`__] - Include Kafka Message Key in Event Header, Updated Comments
+    * [`FLUME-2502 <https://issues.apache.org/jira/browse/FLUME-2502>`__] - Spool source's directory listing is inefficient
+    * [`FLUME-2558 <https://issues.apache.org/jira/browse/FLUME-2558>`__] - Update javadoc for StressSource
+    * [`FLUME-2562 <https://issues.apache.org/jira/browse/FLUME-2562>`__] - Metrics for Flafka components
+    * [`FLUME-2591 <https://issues.apache.org/jira/browse/FLUME-2591>`__] - Kite DatasetSink 2.0
+    * [`FLUME-2613 <https://issues.apache.org/jira/browse/FLUME-2613>`__] - Tool/script for deleting individual message from queue
+    * [`FLUME-2642 <https://issues.apache.org/jira/browse/FLUME-2642>`__] - Limit kerberos relogin attempt
+
+** New Feature
+    * [`FLUME-1734 <https://issues.apache.org/jira/browse/FLUME-1734>`__] - Create a Hive Sink based on the new Hive Streaming support
+    * [`FLUME-2242 <https://issues.apache.org/jira/browse/FLUME-2242>`__] - Flume Sink and Source for Apache Kafka
+    * [`FLUME-2426 <https://issues.apache.org/jira/browse/FLUME-2426>`__] - Support interceptors in the Embedded Agent
+    * [`FLUME-2431 <https://issues.apache.org/jira/browse/FLUME-2431>`__] - Add simple regex search-and-replace interceptor
+    * [`FLUME-2570 <https://issues.apache.org/jira/browse/FLUME-2570>`__] - Add option to not pad date fields
+    * [`FLUME-2574 <https://issues.apache.org/jira/browse/FLUME-2574>`__] - SSL Support for Thrift Rpc
+    * [`FLUME-2631 <https://issues.apache.org/jira/browse/FLUME-2631>`__] - End to End authentication in Flume
+
+** Task
+    * [`FLUME-2365 <https://issues.apache.org/jira/browse/FLUME-2365>`__] - Please create a DOAP file for your TLP
+    * [`FLUME-2454 <https://issues.apache.org/jira/browse/FLUME-2454>`__] - Support batchSize to allow multiple events per transaction to the Kafka Sink
+    * [`FLUME-2455 <https://issues.apache.org/jira/browse/FLUME-2455>`__] - Documentation update for Kafka Sink
+    * [`FLUME-2523 <https://issues.apache.org/jira/browse/FLUME-2523>`__] - Document Kafka channel
+    * [`FLUME-2612 <https://issues.apache.org/jira/browse/FLUME-2612>`__] - Update kite to 0.17.1
+
+** Test
+    * [`FLUME-1501 <https://issues.apache.org/jira/browse/FLUME-1501>`__] - Flume Scribe Source needs unit tests.
+

Modified: websites/staging/flume/trunk/content/_sources/releases/index.txt
==============================================================================
--- websites/staging/flume/trunk/content/_sources/releases/index.txt (original)
+++ websites/staging/flume/trunk/content/_sources/releases/index.txt Mon Jun  1 19:50:47 2015
@@ -3,13 +3,13 @@ Releases
 
 .. rubric:: Current Release
 
-The current stable release is `Apache Flume Version 1.5.2 <1.5.2.html>`__.
+The current stable release is `Apache Flume Version 1.6.0 <1.6.0.html>`__.
 
 .. toctree::
    :maxdepth: 1
    :hidden:
 
-   1.5.2
+   1.6.0
 
 .. rubric:: Previous Releases
 
@@ -17,6 +17,7 @@ The current stable release is `Apache Fl
    :maxdepth: 1
    :glob:
 
+   1.5.2
    1.5.0.1
    1.5.0
    1.4.0

Modified: websites/staging/flume/trunk/content/documentation.html
==============================================================================
--- websites/staging/flume/trunk/content/documentation.html (original)
+++ websites/staging/flume/trunk/content/documentation.html Mon Jun  1 19:50:47 2015
@@ -25,7 +25,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="top" title="Apache Flume" href="index.html" />
-    <link rel="next" title="Flume 1.5.2 User Guide" href="FlumeUserGuide.html" />
+    <link rel="next" title="Flume 1.6.0 User Guide" href="FlumeUserGuide.html" />
     <link rel="prev" title="Download" href="download.html" /> 
   </head>
   <body>

Modified: websites/staging/flume/trunk/content/download.html
==============================================================================
--- websites/staging/flume/trunk/content/download.html (original)
+++ websites/staging/flume/trunk/content/download.html Mon Jun  1 19:50:47 2015
@@ -73,14 +73,14 @@ originals on the main distribution serve
 </colgroup>
 <tbody valign="top">
 <tr class="row-odd"><td>Apache Flume binary (tar.gz)</td>
-<td><a class="reference external" href="http://www.apache.org/dyn/closer.cgi/flume/1.5.2/apache-flume-1.5.2-bin.tar.gz">apache-flume-1.5.2-bin.tar.gz</a></td>
-<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.5.2/apache-flume-1.5.2-bin.tar.gz.md5">apache-flume-1.5.2-bin.tar.gz.md5</a></td>
-<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.5.2/apache-flume-1.5.2-bin.tar.gz.asc">apache-flume-1.5.2-bin.tar.gz.asc</a></td>
+<td><a class="reference external" href="http://www.apache.org/dyn/closer.cgi/flume/1.6.0/apache-flume-1.6.0-bin.tar.gz">apache-flume-1.6.0-bin.tar.gz</a></td>
+<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.6.0/apache-flume-1.6.0-bin.tar.gz.md5">apache-flume-1.6.0-bin.tar.gz.md5</a></td>
+<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.6.0/apache-flume-1.6.0-bin.tar.gz.asc">apache-flume-1.6.0-bin.tar.gz.asc</a></td>
 </tr>
 <tr class="row-even"><td>Apache Flume source (tar.gz)</td>
-<td><a class="reference external" href="http://www.apache.org/dyn/closer.cgi/flume/1.5.2/apache-flume-1.5.2-src.tar.gz">apache-flume-1.5.2-src.tar.gz</a></td>
-<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.5.2/apache-flume-1.5.2-src.tar.gz.md5">apache-flume-1.5.2-src.tar.gz.md5</a></td>
-<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.5.2/apache-flume-1.5.2-src.tar.gz.asc">apache-flume-1.5.2-src.tar.gz.asc</a></td>
+<td><a class="reference external" href="http://www.apache.org/dyn/closer.cgi/flume/1.6.0/apache-flume-1.6.0-src.tar.gz">apache-flume-1.6.0-src.tar.gz</a></td>
+<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.6.0/apache-flume-1.6.0-src.tar.gz.md5">apache-flume-1.6.0-src.tar.gz.md5</a></td>
+<td><a class="reference external" href="http://www.us.apache.org/dist/flume/1.6.0/apache-flume-1.6.0-src.tar.gz.asc">apache-flume-1.6.0-src.tar.gz.asc</a></td>
 </tr>
 </tbody>
 </table>
@@ -92,10 +92,10 @@ as well as the asc signature file for th
 <a class="reference external" href="http://www.apache.org/dist/flume/">main distribution directory</a> rather than from a mirror.
 Then verify the signatures using:</p>
 <div class="highlight-none"><div class="highlight"><pre>% gpg --import KEYS
-% gpg --verify apache-flume-1.5.2-src.tar.gz.asc
+% gpg --verify apache-flume-1.6.0-src.tar.gz.asc
 </pre></div>
 </div>
-<p>Apache Flume 1.5.2 is signed by Hari Shreedharan 77FFC9AB</p>
+<p>Apache Flume 1.6.0 is signed by Johny Rufus 2C79120F</p>
 <p>Alternatively, you can verify the MD5 or SHA1 signatures of the files. A program called md5, md5sum, or shasum is included in many
 Unix distributions for this purpose.</p>
 <p class="rubric">Previous_Releases</p>

Modified: websites/staging/flume/trunk/content/index.html
==============================================================================
--- websites/staging/flume/trunk/content/index.html (original)
+++ websites/staging/flume/trunk/content/index.html Mon Jun  1 19:50:47 2015
@@ -70,6 +70,29 @@ application.</p>
 <img alt="Agent component diagram" src="_images/DevGuide_image00.png" />
 </div>
 <p class="rubric">News</p>
+<h3>May 20, 2015 - Apache Flume 1.6.0 Released</h3><p>The Apache Flume team is pleased to announce the release of Flume 1.6.0.</p>
+<p>Flume is a distributed, reliable, and available service for efficiently
+collecting, aggregating, and moving large amounts of streaming event data.</p>
+<p>Version 1.6.0 is the ninth Flume release as an Apache top-level project.
+Flume 1.6.0 is stable, production-ready software, and is backwards-compatible
+with previous versions of the Flume 1.x codeline.</p>
+<p>Several months of active development went into this release: 105 patches were committed since 1.5.2, representing many features, enhancements, and bug fixes. While the full change log can be found on the 1.6.0 release page (link below), here are a few new feature highlights:</p>
+<blockquote>
+<div><ul class="simple">
+<li>Flume Sink and Source for Apache Kafka</li>
+<li>A new channel that uses Kafka</li>
+<li>Hive Sink based on the new Hive Streaming support</li>
+<li>End to End authentication in Flume</li>
+<li>Simple regex search-and-replace interceptor</li>
+</ul>
+</div></blockquote>
+<p>The full change log and documentation are available on the
+<a class="reference external" href="releases/1.6.0.html">Flume 1.6.0 release page</a>.</p>
+<p>This release can be downloaded from the Flume <a class="reference external" href="download.html">Download</a> page.</p>
+<p>Your contributions, feedback, help and support make Flume better!
+For more information on how to report problems or contribute,
+please visit our <a class="reference external" href="getinvolved.html">Get Involved</a> page.</p>
+<p>The Apache Flume Team</p>
 <h3>November 18, 2014 - Apache Flume 1.5.2 Released</h3><p>The Apache Flume team is pleased to announce the release of Flume 1.5.2</p>
 <p>Flume is a distributed, reliable, and available service for efficiently
 collecting, aggregating, and moving large amounts of streaming event data.</p>

Modified: websites/staging/flume/trunk/content/project-reports.html
==============================================================================
--- websites/staging/flume/trunk/content/project-reports.html (original)
+++ websites/staging/flume/trunk/content/project-reports.html Mon Jun  1 19:50:47 2015
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Feb 6, 2015 -->
+<!-- Generated by Apache Maven Doxia at Jun 1, 2015 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12,7 +12,7 @@
     <script type="text/javascript" src="./js/apache-maven-fluido.min.js"></script>
 
     
-    <meta name="Date-Revision-yyyymmdd" content="20150206" />
+    <meta name="Date-Revision-yyyymmdd" content="20150601" />
     <meta http-equiv="Content-Language" content="en" />
     
         </head>
@@ -27,7 +27,7 @@
                 
                             
                 
-                  <li id="publishDate" class="pull-right">Last Published: 2015-02-06</li> 
+                  <li id="publishDate" class="pull-right">Last Published: 2015-06-01</li> 
                     </ul>
       </div>
 

Modified: websites/staging/flume/trunk/content/releases/1.5.2.html
==============================================================================
--- websites/staging/flume/trunk/content/releases/1.5.2.html (original)
+++ websites/staging/flume/trunk/content/releases/1.5.2.html Mon Jun  1 19:50:47 2015
@@ -27,7 +27,7 @@
     <link rel="top" title="Apache Flume" href="../index.html" />
     <link rel="up" title="Releases" href="index.html" />
     <link rel="next" title="Version 1.5.0.1" href="1.5.0.1.html" />
-    <link rel="prev" title="Releases" href="index.html" /> 
+    <link rel="prev" title="Version 1.6.0" href="1.6.0.html" /> 
   </head>
   <body>
 <div class="header">

Added: websites/staging/flume/trunk/content/releases/1.6.0.html
==============================================================================
--- websites/staging/flume/trunk/content/releases/1.6.0.html (added)
+++ websites/staging/flume/trunk/content/releases/1.6.0.html Mon Jun  1 19:50:47 2015
@@ -0,0 +1,263 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    
+    <title>Version 1.6.0 &mdash; Apache Flume</title>
+    
+    <link rel="stylesheet" href="../_static/flume.css" type="text/css" />
+    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+    
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    '../',
+        VERSION:     '',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="../_static/jquery.js"></script>
+    <script type="text/javascript" src="../_static/underscore.js"></script>
+    <script type="text/javascript" src="../_static/doctools.js"></script>
+    <link rel="top" title="Apache Flume" href="../index.html" />
+    <link rel="up" title="Releases" href="index.html" />
+    <link rel="next" title="Version 1.5.2" href="1.5.2.html" />
+    <link rel="prev" title="Releases" href="index.html" /> 
+  </head>
+  <body>
+<div class="header">
+  <table width="100%" border="0">
+    <tr>
+      <td width="10%">
+        <div class="logo">
+          <a href="../index.html">
+            <img class="logo" src="../_static/flume-logo.png" alt="Logo"/>
+        </div>
+      </td>
+      <td width="2%">
+          <span class="trademark">&trade;</span>
+      </td>
+      <td width="68%" align="center" class="pageTitle">Apache Flume<sup><span class="trademark">&trade;</span></sup>
+      </td>
+      <td width="20%">
+          <a href="http://www.apache.org">
+            <img src="../_static/feather-small.png" alt="Apache Software Foundation" height="70"/>
+          </a>
+      </td>
+    </tr>
+  </table>
+</div>
+  
+
+    <div class="document">
+      <div class="documentwrapper">
+        <div class="bodywrapper">
+          <div class="body">
+            
+  <div class="section" id="version-1-6-0">
+<h1>Version 1.6.0<a class="headerlink" href="#version-1-6-0" title="Permalink to this headline">¶</a></h1>
+<p class="rubric">Status of this release</p>
+<p>Apache Flume 1.6.0 is the ninth release of Flume as an Apache top-level project
+(TLP). Apache Flume 1.6.0 is production-ready software.</p>
+<p class="rubric">Release Documentation</p>
+<ul class="simple">
+<li><a class="reference external" href="content/1.6.0/FlumeUserGuide.html">Flume 1.6.0 User Guide</a> (also in <a class="reference external" href="content/1.6.0/FlumeUserGuide.pdf">pdf</a>)</li>
+<li><a class="reference external" href="content/1.6.0/FlumeDeveloperGuide.html">Flume 1.6.0 Developer Guide</a> (also in <a class="reference external" href="content/1.6.0/FlumeDeveloperGuide.pdf">pdf</a>)</li>
+<li><a class="reference external" href="content/1.6.0/apidocs/index.html">Flume 1.6.0 API Documentation</a></li>
+</ul>
+<p class="rubric">Changes</p>
+<p>Release Notes - Flume - Version v1.6.0</p>
+<dl class="docutils">
+<dt>** Sub-task</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2250">FLUME-2250</a>] - Add support for Kafka Source</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2251">FLUME-2251</a>] - Add support for Kafka Sink</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2677">FLUME-2677</a>] - Update versions in 1.6.0 branch</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2686">FLUME-2686</a>] - Update KEYS file for 1.6 release</li>
+</ul>
+</dd>
+<dt>** Bug</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1793">FLUME-1793</a>] - Unit test TestElasticSearchLogStashEventSerializer fails with IBM JDK</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1934">FLUME-1934</a>] - Spoolingdir source exception when reading multiple   zero size files</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2024">FLUME-2024</a>] - Add ExecSource flush timeout to Flume User Guide</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2126">FLUME-2126</a>] - Problem in elasticsearch sink when the event body is a complex field</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2148">FLUME-2148</a>] - Windows : Add  flume-env.ps1</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2214">FLUME-2214</a>] - FileChannelIntegrityTool needs documentation in user guide</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2245">FLUME-2245</a>] - HDFS files with errors unable to close</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2337">FLUME-2337</a>] - export JAVA_HOME in flume-env.sh.template and increase heap size</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2346">FLUME-2346</a>] - idLogFileMap in Log can lose track of file ids</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2404">FLUME-2404</a>] - Default maxReadBufferBytes might cause OOM and cause scribe source exit</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2408">FLUME-2408</a>] - Remove FLUME-1899 from Flume 1.5.0 change log.</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2416">FLUME-2416</a>] - Use CodecPool in compressed stream to prevent leak of direct buffers</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2420">FLUME-2420</a>] - HDFSEventSink#stop might throw ConcurrentModificationException</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2425">FLUME-2425</a>] - FileChannel should trim data and checkpoint directories</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2432">FLUME-2432</a>] - Update Kite dependency to 0.15.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2438">FLUME-2438</a>] - Make Syslog source message body configurable</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2450">FLUME-2450</a>] - Improve replay index insertion speed.</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2466">FLUME-2466</a>] - Embedded agent name cannot contain spaces</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2470">FLUME-2470</a>] - Kafka Sink and Source must use camel case for all configs.</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2472">FLUME-2472</a>] - SyslogUtils fails when system locale is not English</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2475">FLUME-2475</a>] - toLowerCase/toUpperCase used without Locale parameter to manipulate Enum</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2479">FLUME-2479</a>] - Kafka property auto.commit.enable is incorrect for KafkaSource</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2480">FLUME-2480</a>] - Typo in file channel exception: &#8220;Usable space exhaused&#8221;</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2481">FLUME-2481</a>] - TestFileChannelEncryption fails with System locale other than en_US</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2482">FLUME-2482</a>] - Race condition in File Channels&#8217; Log.removeOldLogs</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2486">FLUME-2486</a>] - TestExecSource fails on some environments</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2487">FLUME-2487</a>] - SyslogParser has rounding errors in timestamp parsing</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2488">FLUME-2488</a>] - TestElasticSearchRestClient fails on Oracle JDK 8</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2489">FLUME-2489</a>] - Upgrade Apache Curator to 2.6.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2492">FLUME-2492</a>] - Flume&#8217;s Kafka Source doesn&#8217;t account time correctly</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2495">FLUME-2495</a>] - Kafka Source may miss events when channel is not available</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2497">FLUME-2497</a>] - TCP and UDP syslog sources parsing the timestamp incorrectly</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2500">FLUME-2500</a>] - Add a channel that uses Kafka</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2505">FLUME-2505</a>] - Test added in FLUME-2502 is flaky</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2517">FLUME-2517</a>] - Performance issue: SimpleDateFormat constructor takes 30% of HDFSEventSink.process()</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2525">FLUME-2525</a>] - flume should handle a zero byte .flumespool-main.meta file for the spooldir source</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2538">FLUME-2538</a>] - TestResettableFileInputStream fails on JDK 8</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2556">FLUME-2556</a>] - TestBucketPath.testDateFormatHours fails intermittently</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2557">FLUME-2557</a>] - DatasetSink doesn&#8217;t work with Kerberos</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2560">FLUME-2560</a>] - Kafka channel entries missing for output jar generation</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2568">FLUME-2568</a>] - Additional fix for TestReliableSpoolingFileEventReader</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2578">FLUME-2578</a>] - Kafka source throws NPE if Kafka record has null key</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2586">FLUME-2586</a>] - HDFS Sink should have an option to try rename even if close fails</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2592">FLUME-2592</a>] - Specify main manifest attribute in flume tools jar</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2594">FLUME-2594</a>] - Close Async HBase Client if there are large number of consecutive timeouts</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2595">FLUME-2595</a>] - Add option to checkpoint on file channel shutdown</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2624">FLUME-2624</a>] - Improve Hive Sink performance</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2626">FLUME-2626</a>] - Remove trustmanager-type from Thrift RPC client</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2633">FLUME-2633</a>] - Update Kite dependency to 1.0.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2639">FLUME-2639</a>] - SecureThriftRpcClient client privileged calls throw IllegalAccessError</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2645">FLUME-2645</a>] - ipFilter.rules property name is wrong</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2654">FLUME-2654</a>] - Memory channel error message related to byteCapacity needs refining</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2657">FLUME-2657</a>] - Upgrade to Hive 1.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2658">FLUME-2658</a>] - Upgrade to Hbase 1.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2664">FLUME-2664</a>] - Site profile fails due to dependency issues</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2665">FLUME-2665</a>] - Update documentation for hdfs.closeTries based on FLUME-2586</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2670">FLUME-2670</a>] - Modify dependencies to not pull hadoop/hive related jars</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2673">FLUME-2673</a>] - Remove unused import in TestLog</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2678">FLUME-2678</a>] - Upgrade xalan to 2.7.2 to take care of CVE-2014-0107 vulnerability</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2679">FLUME-2679</a>] - Make hbase-1 the default profile</li>
+</ul>
+</dd>
+<dt>** Dependency upgrade</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2443">FLUME-2443</a>] - org.apache.hadoop.fs.FSDataOutputStream.sync() is deprecated in hadoop 2.4</li>
+</ul>
+</dd>
+<dt>** Documentation</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1594">FLUME-1594</a>] - Document JMX options</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2509">FLUME-2509</a>] - Add description for properties in Failover Sink Processor</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2630">FLUME-2630</a>] - Update documentation for Thrift Src/Sink SSL support and Kerberos support</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2635">FLUME-2635</a>] - Documentation for zookeeper dynamic configuration in flume</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2668">FLUME-2668</a>] - Document SecureThriftRpcClient/SecureRpcClientFactory in Flume Developer Guide</li>
+</ul>
+</dd>
+<dt>** Improvement</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1334">FLUME-1334</a>] - Write an startscript for flume agents on Windows</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1491">FLUME-1491</a>] - Dynamic configuration from Zookeeper watcher</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1521">FLUME-1521</a>] - Document the StressSource</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1710">FLUME-1710</a>] - JSONEvent.getBody should not return null</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1920">FLUME-1920</a>] - Test case TestFileChannel fails when flume is built from paths containing the string &#8220;hadoop&#8221;</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2237">FLUME-2237</a>] - Example config in User Guide to use same notation for Agent name</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2246">FLUME-2246</a>] - event body data size can make it configurable for logger sinker</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2273">FLUME-2273</a>] - ElasticSearchSink: Add handling for header substitution in indexName</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2373">FLUME-2373</a>] - Enable configuration to switch thrift source serialization protocol</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2385">FLUME-2385</a>] - Flume spans log file with &#8220;Spooling Directory Source runner has shutdown&#8221; messages at INFO level</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2401">FLUME-2401</a>] - Optionally Compress Backup Checkpoint</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2439">FLUME-2439</a>] - Update DatasetSink for Kite 0.15.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2462">FLUME-2462</a>] - Remove use of deprecated methods in DatasetSink</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2463">FLUME-2463</a>] - Add support for Hive and HBase datasets to DatasetSink</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2469">FLUME-2469</a>] - DatasetSink should load dataset when needed, not at startup</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2499">FLUME-2499</a>] - Include Kafka Message Key in Event Header, Updated Comments</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2502">FLUME-2502</a>] - Spool source&#8217;s directory listing is inefficient</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2558">FLUME-2558</a>] - Update javadoc for StressSource</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2562">FLUME-2562</a>] - Metrics for Flafka components</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2591">FLUME-2591</a>] - Kite DatasetSink 2.0</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2613">FLUME-2613</a>] - Tool/script for deleting individual message from queue</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2642">FLUME-2642</a>] - Limit kerberos relogin attempt</li>
+</ul>
+</dd>
+<dt>** New Feature</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1734">FLUME-1734</a>] - Create a Hive Sink based on the new Hive Streaming support</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2242">FLUME-2242</a>] - Flume Sink and Source for Apache Kafka</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2426">FLUME-2426</a>] - Support interceptors in the Embedded Agent</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2431">FLUME-2431</a>] - Add simple regex search-and-replace interceptor</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2570">FLUME-2570</a>] - Add option to not pad date fields</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2574">FLUME-2574</a>] - SSL Support for Thrift Rpc</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2631">FLUME-2631</a>] - End to End authentication in Flume</li>
+</ul>
+</dd>
+<dt>** Task</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2365">FLUME-2365</a>] - Please create a DOAP file for your TLP</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2454">FLUME-2454</a>] - Support batchSize to allow multiple events per transaction to the Kafka Sink</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2455">FLUME-2455</a>] - Documentation update for Kafka Sink</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2523">FLUME-2523</a>] - Document Kafka channel</li>
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-2612">FLUME-2612</a>] - Update kite to 0.17.1</li>
+</ul>
+</dd>
+<dt>** Test</dt>
+<dd><ul class="first last simple">
+<li>[<a class="reference external" href="https://issues.apache.org/jira/browse/FLUME-1501">FLUME-1501</a>] - Flume Scribe Source needs unit tests.</li>
+</ul>
+</dd>
+</dl>
+</div>
+
+
+          </div>
+        </div>
+      </div>
+      <div class="sphinxsidebar">
+        <div class="sphinxsidebarwrapper"><h3><a href="../index.html">Apache Flume</a></h3>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getinvolved.html">How to Get Involved</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../download.html">Download</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documentation.html">Documentation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="index.html">Releases</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../mailinglists.html">Mailing lists</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../team.html">Team</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../source.html">Source Repository</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../license.html">Apache License</a></li>
+</ul>
+
+<h3>Resources</h3>
+
+<ul class="this-page-menu">
+    <li><a href="https://issues.apache.org/jira/browse/FLUME">Flume Issue Tracking (Jira)</a></li>
+    <li><a href="http://cwiki.apache.org/confluence/display/FLUME">Flume Wiki</a></li>
+    <li><a href="http://cwiki.apache.org/confluence/display/FLUME/Getting+Started">Getting Started Guide</a></li>
+    <li><a href="https://builds.apache.org/job/flume-trunk/">Jenkins Continuous Integration Server</a></li>
+    <li><a href="https://analysis.apache.org/">Sonar Code Quality Reports</a</li>
+</ul>
+
+<h3>Apache</h3>
+
+<ul class="this-page-menu">
+    <li><a href="http://www.apache.org">Home</a></li>
+    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+    <li><a href="http://www.apache.org/licenses">Licenses</a> </li>
+    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+    <li><a href="http://www.apachecon.com">Conferences</a></li>
+    <li><a href="http://www.apache.org/security/">Security</a></li>
+</ul>
+
+
+        </div>
+      </div>
+      <div class="clearer"></div>
+    </div>
+<div class="footer">
+    &copy; Copyright 2009-2012 The Apache Software Foundation. Apache Flume, Flume, Apache, the Apache feather logo, and the Apache Flume project logo are trademarks of The Apache Software Foundation..
+</div>
+  </body>
+</html>
\ No newline at end of file

Modified: websites/staging/flume/trunk/content/releases/index.html
==============================================================================
--- websites/staging/flume/trunk/content/releases/index.html (original)
+++ websites/staging/flume/trunk/content/releases/index.html Mon Jun  1 19:50:47 2015
@@ -25,8 +25,8 @@
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <link rel="top" title="Apache Flume" href="../index.html" />
-    <link rel="next" title="Version 1.5.2" href="1.5.2.html" />
-    <link rel="prev" title="Flume 1.5.2 Developer Guide" href="../FlumeDeveloperGuide.html" /> 
+    <link rel="next" title="Version 1.6.0" href="1.6.0.html" />
+    <link rel="prev" title="Flume 1.6.0 Developer Guide" href="../FlumeDeveloperGuide.html" /> 
   </head>
   <body>
 <div class="header">
@@ -61,12 +61,13 @@
   <div class="section" id="releases">
 <h1>Releases<a class="headerlink" href="#releases" title="Permalink to this headline">¶</a></h1>
 <p class="rubric">Current Release</p>
-<p>The current stable release is <a class="reference external" href="1.5.2.html">Apache Flume Version 1.5.2</a>.</p>
+<p>The current stable release is <a class="reference external" href="1.6.0.html">Apache Flume Version 1.6.0</a>.</p>
 <div class="toctree-wrapper compound">
 </div>
 <p class="rubric">Previous Releases</p>
 <div class="toctree-wrapper compound">
 <ul>
+<li class="toctree-l1"><a class="reference internal" href="1.5.2.html">Version 1.5.2</a></li>
 <li class="toctree-l1"><a class="reference internal" href="1.5.0.1.html">Version 1.5.0.1</a></li>
 <li class="toctree-l1"><a class="reference internal" href="1.5.0.html">Version 1.5.0</a></li>
 <li class="toctree-l1"><a class="reference internal" href="1.4.0.html">Version 1.4.0</a></li>



Mime
View raw message