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/06/22 13:43:35 UTC
[1/3] storm git commit: STORM-1920 version of parent pom for
storm-kafka-monitor is set 1.0.2-SNAPSHOT in master branch
Repository: storm
Updated Branches:
refs/heads/master 6bf7890b8 -> 0d3a9f05b
STORM-1920 version of parent pom for storm-kafka-monitor is set 1.0.2-SNAPSHOT in master branch
* set it back to 2.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8f66f8c6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8f66f8c6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8f66f8c6
Branch: refs/heads/master
Commit: 8f66f8c64fd02fe0417756c25308683fb3f4c7cf
Parents: 6bf7890
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 22 15:10:16 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 22 15:10:16 2016 +0900
----------------------------------------------------------------------
external/storm-kafka-monitor/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8f66f8c6/external/storm-kafka-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml
index 0ddb156..3af24ce 100644
--- a/external/storm-kafka-monitor/pom.xml
+++ b/external/storm-kafka-monitor/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -124,4 +124,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
[3/3] storm git commit: add STORM-1920 to CHANGELOG
Posted by ka...@apache.org.
add STORM-1920 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0d3a9f05
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0d3a9f05
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0d3a9f05
Branch: refs/heads/master
Commit: 0d3a9f05b434c0eec4318cf9b5108c2744ea5257
Parents: 60b2f66
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 22 22:43:18 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 22 22:43:18 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0d3a9f05/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c34d64..7138c5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1920: version of parent pom for storm-kafka-monitor is set 1.0.2-SNAPSHOT in master branch
* STORM-1896: Remove duplicate code from HDFS spout
* STORM-1909: Update HDFS spout documentation
* STORM-1705: Cap number of retries for a failed message
[2/3] storm git commit: Merge branch 'STORM-1920'
Posted by ka...@apache.org.
Merge branch 'STORM-1920'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/60b2f663
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/60b2f663
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/60b2f663
Branch: refs/heads/master
Commit: 60b2f663bbd79997941b340b91eed32945eb2af5
Parents: 6bf7890 8f66f8c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 22 22:42:53 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 22 22:42:53 2016 +0900
----------------------------------------------------------------------
external/storm-kafka-monitor/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------