You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by do...@apache.org on 2016/06/21 14:49:26 UTC
[1/3] storm git commit: STORM-1896 : HdfsSpout remove duplicated code
Repository: storm
Updated Branches:
refs/heads/master 6dd3f6b6d -> 6e67ea7a3
STORM-1896 : HdfsSpout remove duplicated code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a6023dc9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a6023dc9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a6023dc9
Branch: refs/heads/master
Commit: a6023dc9c0076e3c875f1eb34ec3eb662f9d8e0b
Parents: 2c77a20
Author: darionyaphet <da...@gmail.com>
Authored: Thu Jun 9 23:00:38 2016 +0800
Committer: darionyaphet <da...@gmail.com>
Committed: Thu Jun 9 23:00:38 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a6023dc9/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
index 06896b2..d894855 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
@@ -285,10 +285,7 @@ public class HdfsSpout extends BaseRichSpout {
this.commitTimer = new Timer();
this.tracker = new ProgressTracker();
this.hdfsConfig = new Configuration();
-
this.collector = collector;
- this.hdfsConfig = new Configuration();
- this.tupleCounter = 0;
// Hdfs related settings
if( conf.containsKey(Configs.HDFS_URI)) {
[3/3] storm git commit: Added STORM-1896 to CHANGELOG
Posted by do...@apache.org.
Added STORM-1896 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6e67ea7a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6e67ea7a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6e67ea7a
Branch: refs/heads/master
Commit: 6e67ea7a37ee288bf38d69c2e03961cca9e82677
Parents: 1722e7a
Author: Aaron Niskode-Dossett <an...@etsy.com>
Authored: Tue Jun 21 14:48:18 2016 +0000
Committer: Aaron Niskode-Dossett <an...@etsy.com>
Committed: Tue Jun 21 14:48:18 2016 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6e67ea7a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dfda04..f4e758e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1896: Remove duplicate code from HDFS spout
* STORM-1909: Update HDFS spout documentation
* STORM-1705: Cap number of retries for a failed message
* STORM-1884: Prioritize pendingPrepare over pendingCommit
[2/3] storm git commit: Merge branch 'STORM-1896' of
https://github.com/darionyaphet/storm into STORM-1896
Posted by do...@apache.org.
Merge branch 'STORM-1896' of https://github.com/darionyaphet/storm into STORM-1896
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1722e7a3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1722e7a3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1722e7a3
Branch: refs/heads/master
Commit: 1722e7a30e8346bf4465268041332ac98caf04a6
Parents: 6dd3f6b a6023dc
Author: Aaron Niskode-Dossett <an...@etsy.com>
Authored: Tue Jun 21 14:46:01 2016 +0000
Committer: Aaron Niskode-Dossett <an...@etsy.com>
Committed: Tue Jun 21 14:46:01 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------