You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/02/19 21:02:38 UTC

[1/2] storm git commit: STORM-1541 Change scope of 'hadoop-minicluster' to test

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 7715ad10c -> 69cf90de4


STORM-1541 Change scope of 'hadoop-minicluster' to test


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/29bda16b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/29bda16b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/29bda16b

Branch: refs/heads/1.x-branch
Commit: 29bda16bc37804c74924fff25b2ba2d75e584b68
Parents: 7715ad1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 12 09:43:45 2016 +0900
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Feb 19 15:01:38 2016 -0500

----------------------------------------------------------------------
 external/storm-hdfs/pom.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/29bda16b/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 5e8cce4..a3fe871 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -115,17 +115,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-minicluster</artifactId>
-            <version>${hadoop.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-auth</artifactId>
             <version>${hadoop.version}</version>
             <exclusions>
@@ -195,6 +184,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-minicluster</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-avro-serializer</artifactId>
             <version>1.0</version>


[2/2] storm git commit: add STORM-1541 to changelog

Posted by pt...@apache.org.
add STORM-1541 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/69cf90de
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/69cf90de
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/69cf90de

Branch: refs/heads/1.x-branch
Commit: 69cf90de467693d4949fcc272ac9ebd893fb18a2
Parents: 29bda16
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Feb 19 15:02:25 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Feb 19 15:02:25 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/69cf90de/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b91c20..7457843 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.0
+ * STORM-1541: Change scope of 'hadoop-minicluster' to test
  * STORM-1539: Improve Storm ACK-ing performance
  * STORM-1519: Storm syslog logging not confirming to RFC5426 3.1
  * STORM-1533: IntegerValidator for metric consumer parallelism hint