You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2014/11/12 21:03:03 UTC

[1/4] flume git commit: Update pom.xml files to version 1.5.2

Repository: flume
Updated Branches:
  refs/heads/flume-1.5 3aceda6eb -> 229442aa6


Update pom.xml files to version 1.5.2


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/08915f95
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/08915f95
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/08915f95

Branch: refs/heads/flume-1.5
Commit: 08915f957da0593e717b149b4896bf047c9b7f5c
Parents: 3aceda6
Author: Hari Shreedharan <hs...@apache.org>
Authored: Wed Nov 12 11:54:07 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Wed Nov 12 11:54:07 2014 -0800

----------------------------------------------------------------------
 flume-ng-channels/flume-file-channel/pom.xml    |  2 +-
 flume-ng-channels/flume-jdbc-channel/pom.xml    |  2 +-
 .../flume-spillable-memory-channel/pom.xml      |  2 +-
 flume-ng-channels/pom.xml                       |  2 +-
 flume-ng-clients/flume-ng-log4jappender/pom.xml |  2 +-
 flume-ng-clients/pom.xml                        |  2 +-
 flume-ng-configuration/pom.xml                  |  2 +-
 flume-ng-core/pom.xml                           |  2 +-
 flume-ng-dist/pom.xml                           |  2 +-
 flume-ng-embedded-agent/pom.xml                 |  2 +-
 .../flume-avro-source/pom.xml                   |  2 +-
 .../flume-thrift-source/pom.xml                 |  2 +-
 flume-ng-legacy-sources/pom.xml                 |  2 +-
 flume-ng-node/pom.xml                           |  2 +-
 flume-ng-sdk/pom.xml                            |  2 +-
 flume-ng-sinks/flume-dataset-sink/pom.xml       |  2 +-
 flume-ng-sinks/flume-hdfs-sink/pom.xml          |  2 +-
 flume-ng-sinks/flume-irc-sink/pom.xml           |  2 +-
 .../flume-ng-elasticsearch-sink/pom.xml         |  2 +-
 flume-ng-sinks/flume-ng-hbase-sink/pom.xml      |  2 +-
 .../flume-ng-morphline-solr-sink/pom.xml        |  4 +-
 flume-ng-sinks/pom.xml                          |  2 +-
 flume-ng-sources/flume-jms-source/pom.xml       |  2 +-
 flume-ng-sources/flume-scribe-source/pom.xml    |  2 +-
 flume-ng-sources/flume-twitter-source/pom.xml   |  2 +-
 flume-ng-sources/pom.xml                        |  2 +-
 flume-ng-tests/pom.xml                          |  2 +-
 flume-tools/pom.xml                             |  2 +-
 pom.xml                                         | 50 ++++++++++----------
 29 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-channels/flume-file-channel/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml
index ef0a4f9..5bd55e5 100644
--- a/flume-ng-channels/flume-file-channel/pom.xml
+++ b/flume-ng-channels/flume-file-channel/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>flume-ng-channels</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-channels</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-channels/flume-jdbc-channel/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-jdbc-channel/pom.xml b/flume-ng-channels/flume-jdbc-channel/pom.xml
index aacca64..9939c6a 100644
--- a/flume-ng-channels/flume-jdbc-channel/pom.xml
+++ b/flume-ng-channels/flume-jdbc-channel/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-channels</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-channels</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-channels/flume-spillable-memory-channel/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml
index 79851e2..c7e52cb 100644
--- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml
+++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>flume-ng-channels</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-channels</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-channels/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/pom.xml b/flume-ng-channels/pom.xml
index fb09403..869e89c 100644
--- a/flume-ng-channels/pom.xml
+++ b/flume-ng-channels/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-clients/flume-ng-log4jappender/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-clients/flume-ng-log4jappender/pom.xml b/flume-ng-clients/flume-ng-log4jappender/pom.xml
index 2c5e836..1505b59 100644
--- a/flume-ng-clients/flume-ng-log4jappender/pom.xml
+++ b/flume-ng-clients/flume-ng-log4jappender/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-clients</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <relativePath>..</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-clients/pom.xml b/flume-ng-clients/pom.xml
index b578565..b587726 100644
--- a/flume-ng-clients/pom.xml
+++ b/flume-ng-clients/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>flume-ng-clients</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml
index 029fcbc..b3b5d92 100644
--- a/flume-ng-configuration/pom.xml
+++ b/flume-ng-configuration/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>flume-ng-configuration</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-core/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml
index e31796c..71955cd 100644
--- a/flume-ng-core/pom.xml
+++ b/flume-ng-core/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index 567357c..4954e1a 100644
--- a/flume-ng-dist/pom.xml
+++ b/flume-ng-dist/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <artifactId>flume-ng-dist</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-embedded-agent/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml
index 92ffa61..eed2e60 100644
--- a/flume-ng-embedded-agent/pom.xml
+++ b/flume-ng-embedded-agent/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <artifactId>flume-ng-embedded-agent</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-legacy-sources/flume-avro-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml
index 378f023..742c40f 100644
--- a/flume-ng-legacy-sources/flume-avro-source/pom.xml
+++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-legacy-sources</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-legacy-sources/flume-thrift-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/flume-thrift-source/pom.xml b/flume-ng-legacy-sources/flume-thrift-source/pom.xml
index b832e4e..c9d1d84 100644
--- a/flume-ng-legacy-sources/flume-thrift-source/pom.xml
+++ b/flume-ng-legacy-sources/flume-thrift-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-legacy-sources</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-legacy-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/pom.xml b/flume-ng-legacy-sources/pom.xml
index 69c8106..dd49f45 100644
--- a/flume-ng-legacy-sources/pom.xml
+++ b/flume-ng-legacy-sources/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-node/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index e62c21d..d368daf 100644
--- a/flume-ng-node/pom.xml
+++ b/flume-ng-node/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <artifactId>flume-ng-node</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index a3392ec..9108a2d 100644
--- a/flume-ng-sdk/pom.xml
+++ b/flume-ng-sdk/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <artifactId>flume-ng-sdk</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/flume-dataset-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-dataset-sink/pom.xml b/flume-ng-sinks/flume-dataset-sink/pom.xml
index 4fe76e7..f86e5cb 100644
--- a/flume-ng-sinks/flume-dataset-sink/pom.xml
+++ b/flume-ng-sinks/flume-dataset-sink/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sinks</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sinks</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/flume-hdfs-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml
index dfb2195..8654150 100644
--- a/flume-ng-sinks/flume-hdfs-sink/pom.xml
+++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sinks</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sinks</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/flume-irc-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-irc-sink/pom.xml b/flume-ng-sinks/flume-irc-sink/pom.xml
index ff06bbd..09c6c98 100644
--- a/flume-ng-sinks/flume-irc-sink/pom.xml
+++ b/flume-ng-sinks/flume-irc-sink/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sinks</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sinks</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
index b535987..386374e 100644
--- a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
@@ -17,7 +17,7 @@
  <parent>
     <artifactId>flume-ng-sinks</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sinks</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
index 0a4150a..2467220 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>flume-ng-sinks</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
   <groupId>org.apache.flume.flume-ng-sinks</groupId>
   <artifactId>flume-ng-hbase-sink</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
index 5aa4eb8..2f87881 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sinks</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sinks</groupId>
   <artifactId>flume-ng-morphline-solr-sink</artifactId>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <name>Flume NG Morphline Solr Sink</name>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sinks/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml
index 2337c76..52719c5 100644
--- a/flume-ng-sinks/pom.xml
+++ b/flume-ng-sinks/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sources/flume-jms-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-jms-source/pom.xml b/flume-ng-sources/flume-jms-source/pom.xml
index 97e030b..82e5492 100644
--- a/flume-ng-sources/flume-jms-source/pom.xml
+++ b/flume-ng-sources/flume-jms-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sources</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sources</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sources/flume-scribe-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-scribe-source/pom.xml b/flume-ng-sources/flume-scribe-source/pom.xml
index a0801f3..ec8d9ca 100644
--- a/flume-ng-sources/flume-scribe-source/pom.xml
+++ b/flume-ng-sources/flume-scribe-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sources</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sources</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sources/flume-twitter-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-twitter-source/pom.xml b/flume-ng-sources/flume-twitter-source/pom.xml
index 3cd55fc..a89002d 100644
--- a/flume-ng-sources/flume-twitter-source/pom.xml
+++ b/flume-ng-sources/flume-twitter-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-ng-sources</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-sources</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/pom.xml b/flume-ng-sources/pom.xml
index 535a4a3..eda9b2e 100644
--- a/flume-ng-sources/pom.xml
+++ b/flume-ng-sources/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-ng-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml
index 6d9b10e..664b05c 100644
--- a/flume-ng-tests/pom.xml
+++ b/flume-ng-tests/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <artifactId>flume-ng-tests</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/flume-tools/pom.xml
----------------------------------------------------------------------
diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml
index 57d6b56..789935d 100644
--- a/flume-tools/pom.xml
+++ b/flume-tools/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
   <parent>
     <artifactId>flume-parent</artifactId>
     <groupId>org.apache.flume</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
 
   <groupId>org.apache.flume</groupId>

http://git-wip-us.apache.org/repos/asf/flume/blob/08915f95/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c30015c..5c98e22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.flume</groupId>
   <artifactId>flume-parent</artifactId>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <packaging>pom</packaging>
 
   <name>Apache Flume</name>
@@ -192,7 +192,7 @@ limitations under the License.
           <dependency>
             <groupId>org.apache.flume.flume-ng-sinks</groupId>
             <artifactId>flume-dataset-sink</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.2</version>
           </dependency>
         </dependencies>
       </dependencyManagement>
@@ -1064,120 +1064,120 @@ limitations under the License.
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-configuration</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-core</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-tools</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-node</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-channels</groupId>
         <artifactId>flume-file-channel</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-channels</groupId>
         <artifactId>flume-jdbc-channel</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-channels</groupId>
         <artifactId>flume-spillable-memory-channel</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
      <dependency>
        <groupId>org.apache.flume.flume-ng-channels</groupId>
        <artifactId>flume-recoverable-memory-channel</artifactId>
-       <version>1.5.1</version>
+       <version>1.5.2</version>
      </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-hdfs-sink</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-irc-sink</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-ng-hbase-sink</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-ng-elasticsearch-sink</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-ng-morphline-solr-sink</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sources</groupId>
         <artifactId>flume-scribe-source</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sources</groupId>
         <artifactId>flume-jms-source</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sources</groupId>
         <artifactId>flume-twitter-source</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
         <artifactId>flume-thrift-source</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
         <artifactId>flume-avro-source</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-sdk</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-sdk</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <classifier>tests</classifier>
         <scope>test</scope>
       </dependency>
@@ -1185,20 +1185,20 @@ limitations under the License.
       <dependency>
         <groupId>org.apache.flume.flume-ng-clients</groupId>
         <artifactId>flume-ng-log4jappender</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-clients</groupId>
         <artifactId>flume-ng-log4jappender</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <classifier>jar-with-dependencies</classifier>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-embedded-agent</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
       </dependency>
 
       <dependency>


[3/4] flume git commit: Update RELEASE-NOTES for 1.5.2

Posted by hs...@apache.org.
Update RELEASE-NOTES for 1.5.2


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/4323b8df
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/4323b8df
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/4323b8df

Branch: refs/heads/flume-1.5
Commit: 4323b8dfdd064bcf7261a9fb16a3ad036deeceb3
Parents: 80c899c
Author: Hari Shreedharan <hs...@apache.org>
Authored: Wed Nov 12 11:56:22 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Wed Nov 12 11:56:22 2014 -0800

----------------------------------------------------------------------
 RELEASE-NOTES | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/4323b8df/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6f22b21..8a47eaf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-Apache Flume 1.5.1
+Apache Flume 1.5.2
 
 CONTENTS
 1. What is Apache Flume
@@ -17,8 +17,8 @@ simple, extensible data model that allows for online analytic
 application.
 
 2. Status of this release
-Apache Flume 1.5.1 is the seventh release of Flume as an Apache top-level project
-(TLP). Apache Flume 1.5.1 is production-ready software.
+Apache Flume 1.5.2 is the eighth release of Flume as an Apache top-level project
+(TLP). Apache Flume 1.5.2 is production-ready software.
 
 3. Major changes in this Release
 For a detailed list of changes, please see the CHANGELOG file included


[4/4] flume git commit: Update CHANGELOG for 1.5.2

Posted by hs...@apache.org.
Update CHANGELOG for 1.5.2


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/229442aa
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/229442aa
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/229442aa

Branch: refs/heads/flume-1.5
Commit: 229442aa6835ee0faa17e3034bcab42754c460f5
Parents: 4323b8d
Author: Hari Shreedharan <hs...@apache.org>
Authored: Wed Nov 12 12:00:53 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Wed Nov 12 12:00:53 2014 -0800

----------------------------------------------------------------------
 CHANGELOG | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/229442aa/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 7086807..cc73213 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+Release Notes - Flume - Version v1.5.2
+
+** Bug
+    * [FLUME-2547] - Removing SSLv2Hello causes Java 6 clients to break
+
+** Sub-task
+    * [FLUME-2548] - Enable SSLv2Hello for Avro Source and NettyAvroRpcClient
+    * [FLUME-2549] - Enable SSLv2Hello for HttpSource
+
+** Improvement
+    * [FLUME-2551] - Add dev-support to src tarball
+
 Release Notes - Flume - Version v1.5.1
 
 ** Bug


[2/4] flume git commit: Update docs to 1.5.2

Posted by hs...@apache.org.
Update docs to 1.5.2


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/80c899c6
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/80c899c6
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/80c899c6

Branch: refs/heads/flume-1.5
Commit: 80c899c6a1264702150d6a4d8ca22d3d81752163
Parents: 08915f9
Author: Hari Shreedharan <hs...@apache.org>
Authored: Wed Nov 12 11:55:17 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Wed Nov 12 11:55:17 2014 -0800

----------------------------------------------------------------------
 flume-ng-doc/sphinx/FlumeDeveloperGuide.rst | 2 +-
 flume-ng-doc/sphinx/FlumeUserGuide.rst      | 6 +++---
 flume-ng-doc/sphinx/index.rst               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/80c899c6/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
index 33cae94..41381a5 100644
--- a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
@@ -15,7 +15,7 @@
 
 
 ======================================
-Flume 1.5.1 Developer Guide
+Flume 1.5.2 Developer Guide
 ======================================
 
 Introduction

http://git-wip-us.apache.org/repos/asf/flume/blob/80c899c6/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index 68bac8b..718c879 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -15,7 +15,7 @@
 
 
 ======================================
-Flume 1.5.1 User Guide
+Flume 1.5.2 User Guide
 ======================================
 
 Introduction
@@ -2947,7 +2947,7 @@ Log4J Appender
 
 Appends Log4j events to a flume agent's avro source. A client using this
 appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-1.5.1.jar).
+flume-ng-sdk-1.5.2.jar).
 Required properties are in **bold**.
 
 =====================  =======  ==================================================================================
@@ -3011,7 +3011,7 @@ Load Balancing Log4J Appender
 
 Appends Log4j events to a list of flume agent's avro source. A client using this
 appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-1.5.1.jar). This appender supports a round-robin and random
+flume-ng-sdk-1.5.2.jar). This appender supports a round-robin and random
 scheme for performing the load balancing. It also supports a configurable backoff
 timeout so that down agents are removed temporarily from the set of hosts
 Required properties are in **bold**.

http://git-wip-us.apache.org/repos/asf/flume/blob/80c899c6/flume-ng-doc/sphinx/index.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/index.rst b/flume-ng-doc/sphinx/index.rst
index 7e81f7d..fbbb361 100644
--- a/flume-ng-doc/sphinx/index.rst
+++ b/flume-ng-doc/sphinx/index.rst
@@ -15,7 +15,7 @@
 
 
 ================================================
-Apache Flume 1.5.1 documentation
+Apache Flume 1.5.2 documentation
 ================================================
 
 Flume is a distributed, reliable, and available system for efficiently