You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/08/14 14:09:51 UTC

[1/2] storm git commit: Fix parent version of storm-druid and storm-kinesis

Repository: storm
Updated Branches:
  refs/heads/1.x-branch c268523fa -> 8b1deb977


Fix parent version of storm-druid and storm-kinesis

* during the rollback they still keep versions since it's manually fixed after the release process


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

Branch: refs/heads/1.x-branch
Commit: b5458b8ee4668d31a67629fcf0eb4aa3978ef521
Parents: 9e9ec43
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 11 23:43:55 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 11 23:43:55 2016 +0900

----------------------------------------------------------------------
 external/storm-druid/pom.xml   | 2 +-
 external/storm-kinesis/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b5458b8e/external/storm-druid/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-druid/pom.xml b/external/storm-druid/pom.xml
index fb94510..0872c2f 100644
--- a/external/storm-druid/pom.xml
+++ b/external/storm-druid/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/b5458b8e/external/storm-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/pom.xml b/external/storm-kinesis/pom.xml
index a48c008..e10bc2c 100644
--- a/external/storm-kinesis/pom.xml
+++ b/external/storm-kinesis/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>


[2/2] storm git commit: Merge branch 'fix-version-druid-and-kinesis-1.1.1-SNAPSHOT-to-1.1.0-SNAPSHOT' into 1.x-branch

Posted by ka...@apache.org.
Merge branch 'fix-version-druid-and-kinesis-1.1.1-SNAPSHOT-to-1.1.0-SNAPSHOT' into 1.x-branch


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

Branch: refs/heads/1.x-branch
Commit: 8b1deb97791d75ee527851500a8512300a6c925e
Parents: c268523 b5458b8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Aug 14 23:07:03 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Aug 14 23:07:03 2016 +0900

----------------------------------------------------------------------
 external/storm-druid/pom.xml   | 2 +-
 external/storm-kinesis/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------