Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2662
@HeartSaVioR Whoops, added missing file.
---
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2662
STORM-3059: Fix NPE when the processing guarantee is not AT_LEAST_ONCâ¦
â¦E and the spout filters out a null tuple
https://issues.apache.org/jira/browse/STORM-3059
You can merge this pull
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2663
Storm 3059 1.x
https://issues.apache.org/jira/browse/STORM-3059
1.x version of https://github.com/apache/storm/pull/2662
You can merge this pull request into a Git repository by running
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2637#discussion_r185640531
--- Diff: docs/storm-kafka-client.md ---
@@ -313,4 +313,37 @@ KafkaSpoutConfig<String, String> kafkaConf =
KafkaSpoutConfig
.setTupleTrackingEn
Repository: storm
Updated Branches:
refs/heads/master 1117a37b0 -> 57658f7fb
STORM-3041 improve worker-launcher messages
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/75830c0b
Tree:
Merge branch 'agresch_worker_launcher' of https://github.com/agresch/storm into
asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/57658f7f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/57658f7f
Diff:
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2584
@arunmahadevan Thanks, sorry this took so long. Merged to 1.x, 1.1.x and
1.0.x
---
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch f61e5daf2 -> e5108d726
STORM-2985: Explicitly add jackson-annotations dependency in pom dependency
management
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit:
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 0fc6b5224 -> 9638f627e
STORM-2985: Explicitly add jackson-annotations dependency in pom dependency
management
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit:
Merge branch 'STORM-2985' of https://github.com/arunmahadevan/storm into
STORM-2985-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca0835a6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca0835a6
Diff:
Repository: storm
Updated Branches:
refs/heads/1.x-branch efad4cca2 -> ca0835a6b
STORM-2985: Explicitly add jackson-annotations dependency in pom dependency
management
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit:
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2644#discussion_r185330090
--- Diff: storm-core/src/native/worker-launcher/impl/worker-launcher.c ---
@@ -309,7 +309,7 @@ int set_user(const char *user
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2653
[WIP] Detach storm-kafka-client release from Storm proper
Opening this to get feedback on detaching the storm-kafka-client release
cycle from Storm, as discussed on the mailing list. I'm putting
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2652
STORM-3046: Ensure KafkaTridentSpoutEmitter handles empty batches corâ¦
â¦rectly when they occur at the beginning of the stream
See https://issues.apache.org/jira/browse/STORM-3046
You can
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2638
@kishorvpatil Sorry to keep harping on this, but I still don't really
understand how we're getting `InterruptedExceptions` that need to be logged at
error level.
Could you give an example
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2637#discussion_r185174572
--- Diff: docs/storm-kafka-client.md ---
@@ -313,4 +313,37 @@ KafkaSpoutConfig<String, String> kafkaConf =
KafkaSpoutConfig
.setTupleTrackingEn
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2637#discussion_r185174341
--- Diff: docs/storm-kafka-client.md ---
@@ -313,4 +313,37 @@ KafkaSpoutConfig<String, String> kafkaConf =
KafkaSpoutConfig
.setTupleTrackingEn
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2637#discussion_r185174192
--- Diff: docs/storm-kafka-client.md ---
@@ -313,4 +313,37 @@ KafkaSpoutConfig<String, String> kafkaConf =
KafkaSpoutConfig
.setTupleTrackingEn
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2650
STORM-3047: Ensure Trident emitter refreshPartitions is only called wâ¦
â¦ith partitions assigned to the emitter
https://issues.apache.org/jira/browse/STORM-3047
You can merge this pull
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch a6bf3e421 -> 3c7c054c4
[STORM-3043] Fix NullPointerException when apply() returns null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3c7c054c
Tree:
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch 22a962073 -> cfe11249d
[STORM-3043] Fix NullPointerException when apply() returns null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cfe11249
Tree:
Merge branch '1.x-branch' of https://github.com/cleroux/storm into
STORM-3043-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/43c19d60
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/43c19d60
Diff:
Repository: storm
Updated Branches:
refs/heads/1.x-branch 130778fe0 -> 43c19d60a
[STORM-3043] Fix NullPointerException when apply() returns null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6b527dfc
Tree:
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2638
@kishorvpatil Can you elaborate a bit? I don't understand why
`TimeoutException` would be wrapped in an `InterruptedException`? Where is the
log line you posted coming from, a grep of Storm didn't turn
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2648
STORM-3013: Keep KafkaConsumer open when storm-kafka-client spout is â¦
â¦deactivated, in order to keep metrics working
See https://issues.apache.org/jira/browse/STORM-3013
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2642
+1, thanks @cleroux, merged to master. Please open another PR against
1.x-branch, so this fix can make it into 1.x releases too :)
---
Repository: storm
Updated Branches:
refs/heads/master 8bcf866df -> fdab9f9ae
[STORM-3043] Fix NullPointerException when apply() returns null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/38028cfc
Tree:
Merge branch 'master' of https://github.com/cleroux/storm into STORM-3043-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fdab9f9a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fdab9f9a
Diff:
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2633#discussion_r184707886
--- Diff:
external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java ---
@@ -101,6 +101,7 @@
private final AtomicBoolean
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2633#discussion_r184711553
--- Diff:
external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
---
@@ -153,6 +153,35 @@ public void testSimpleText_ACK() throws
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2633#discussion_r184710659
--- Diff:
external/storm-hdfs/src/test/java/org/apache/storm/hdfs/spout/TestHdfsSpout.java
---
@@ -153,6 +153,35 @@ public void testSimpleText_ACK() throws
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2636
@cfriaszapater The failure is because the integration test POM is pointing
at Storm 1.2.0-SNAPSHOT, but this branch has Storm at version 1.1.3-SNAPSHOT.
You should be able to just replace the version
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2642
@cleroux Thanks for the fix. The change looks good to me. Please raise an
issue at https://issues.apache.org/jira/secure/Dashboard.jspa, and include the
issue number in the PR title and the commit
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2638
+1, though I'm not sure whether it is necessary to change the log level to
error.
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2637
@srishtyagrawal Thanks. +1. If you squash the commits I'll merge to master
and 1.x-branch.
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2636
The RAT plugin failure is because the SslProps file doesn't have the Apache
license at the top
---
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2637#discussion_r182955561
--- Diff: docs/storm-kafka-client.md ---
@@ -313,4 +313,25 @@ KafkaSpoutConfig<String, String> kafkaConf =
KafkaSpoutConfig
.setTupleTrackingEn
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2637#discussion_r182955679
--- Diff: docs/storm-kafka-client.md ---
@@ -313,4 +313,25 @@ KafkaSpoutConfig<String, String> kafkaConf =
KafkaSpoutConfig
.setTupleTrackingEn
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2638
Sorry if I'm nitpicking you to death, but I don't think moving the log line
is better. Now everyone gets an error level log, even if the exception is due
to an interrupt. I'd prefer if we just include
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2638#discussion_r182844665
--- Diff: storm-client/src/jvm/org/apache/storm/utils/Utils.java ---
@@ -361,6 +363,7 @@ public void run() {
Time.sleep(s
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2638#discussion_r182833894
--- Diff: storm-client/src/jvm/org/apache/storm/utils/Utils.java ---
@@ -361,6 +363,7 @@ public void run() {
Time.sleep(s
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2638#discussion_r182833344
--- Diff: storm-client/src/jvm/org/apache/storm/utils/Utils.java ---
@@ -109,6 +109,8 @@
import javax.security.auth.Subject;
+import static
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2621
+1, thanks for fixing this.
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2637
I read the documentation for maxOffsetBehind you linked, and I think it is
confusingly phrased. It says
> If a failing tuple's offset is less than maxOffsetBehind, the spout stops
retry
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2620
Sorry, the tests sadly are very unstable on travis on the 1.x branch. Ran
the storm-kafka-client tests locally and verified that they work on Java 7.
---
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 3923b7ab6 -> 6d4791e00
STORM-2994: KafkaSpout consumes messages but doesn't commit offsets
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d4791e0
Tree:
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch f2cdcae34 -> 44b687a99
STORM-2994: KafkaSpout consumes messages but doesn't commit offsets
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/44b687a9
Tree:
Repository: storm
Updated Branches:
refs/heads/1.x-branch 9aac3e0d3 -> caf6d88a2
STORM-2994: KafkaSpout consumes messages but doesn't commit offsets
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d8a37d8f
Tree:
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2593
@reiabreu Merged to master. Looks like there are some small modifications
to do to get it on to 1.x or earlier branches. Could you put up a PR against
1.x as well (should be pretty easy with `git
Merge branch 'STORM-2994-merge' into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/19cdedfc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/19cdedfc
Diff:
Merge branch 'master' of https://github.com/reiabreu/storm into STORM-2994-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a9ea7d5f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a9ea7d5f
Diff:
Repository: storm
Updated Branches:
refs/heads/master 402a371cc -> 19cdedfc8
STORM-2994: KafkaSpout consumes messages but doesn't commit offsets
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/33961ac7
Tree:
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2593
+1, thanks for your patience. Please squash to one commit, and we can merge.
---
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2593#discussion_r178571304
--- Diff:
external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java
---
@@ -0,0 +1,76 @@
+/*
+ * Licensed
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2593#discussion_r178571949
--- Diff:
external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java
---
@@ -0,0 +1,76 @@
+/*
+ * Licensed
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2593#discussion_r178562679
--- Diff:
external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
---
@@ -570,20 +572,25 @@ public void ack(Object messageId
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2593#discussion_r178551488
--- Diff:
external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
---
@@ -570,20 +572,25 @@ public void ack(Object messageId
Repository: storm
Updated Branches:
refs/heads/master cb0bfcedd -> 76af86b58
STORM-3015: Remove kafka_2.10 dependency from storm-kafka-client-examples
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/df9a619b
Tree:
Repository: storm
Updated Branches:
refs/heads/master a851badfb -> cb0bfcedd
[STORM-3018] Fix integration test DemoTest#testExclamationTopology fail problem
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/34c18572
Tree:
Merge branch 'fix-test' of https://github.com/danny0405/storm into
STORM-3018-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cb0bfced
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb0bfced
Diff:
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2619#discussion_r178455098
--- Diff: conf/defaults.yaml ---
@@ -195,7 +195,7 @@ worker.log.level.reset.poll.secs: 30
# control how many worker receiver threads we need per worker
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2619#discussion_r178453508
--- Diff: conf/defaults.yaml ---
@@ -195,7 +195,7 @@ worker.log.level.reset.poll.secs: 30
# control how many worker receiver threads we need per worker
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2587
@Ethanlm Sounds good, thanks.
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2611
Thanks. +1, I think it makes sense to just merge this, and we can take
another look if it turns out to still be flaky.
---
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2612
STORM-3015: Remove kafka_2.10 dependency from storm-kafka-client-examâ¦
â¦ples
https://issues.apache.org/jira/browse/STORM-3015
You can merge this pull request into a Git repository
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2611
+1 assuming this test is stable on travis (2+ minutes for a tick tuple test
seems like a lot, but then travis is probably slow). Have you run it a few
times to check?
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2609
+1
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2596
@krichter722 Thanks, merged to master. I also added you to the contributors
list in JIRA, so you should be able to assign tasks to yourself now.
---
Repository: storm
Updated Branches:
refs/heads/master adf4efb71 -> 283f315f0
[STORM-3004] storm-elasticsearch-examples: fixed all checkstyle warnings
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/eb726038
Tree:
Merge branch 'checkstyle-fix-es-examples' of
https://github.com/krichter722/storm into STORM-3004-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/283f315f
Tree:
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2596
+1, thanks for being patient. @krichter722 could you add the issue number
to the commit message, I'll merge after that. I'd add it myself, but then the
PR won't show as merged.
---
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r177155543
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -92,20 +173,37 @@ public void
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r177155194
--- Diff: external/storm-opentsdb/pom.xml ---
@@ -1,3 +1,4 @@
+
--- End diff --
This change seems unnecessary.
---
GitHub user srdo opened a pull request:
https://github.com/apache/storm/pull/2606
STORM-3009: Upgrade to Dropwizard 1.3.0, and ensure storm-webapp has â¦
â¦only one SLF4j binding on the classpath
https://issues.apache.org/jira/browse/STORM-3009
Verified
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176944098
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -34,52 +39,128 @@
import
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2588
By the way, when you get a chance, please go to
https://issues.apache.org/jira and create an issue for tracking these changes,
then rename the PR and commit(s) so they contain the issue number
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908031
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -92,20 +173,37 @@ public void
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908105
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/common/EsConstants.java
---
@@ -15,8 +15,28 @@
* See
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908034
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -92,20 +173,37 @@ public void
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908239
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
---
@@ -53,79 +78,197 @@ public
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908219
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
---
@@ -53,79 +78,197 @@ public
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908195
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
---
@@ -53,79 +78,197 @@ public
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176907985
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -34,52 +39,128 @@
import
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176907913
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -34,52 +39,128 @@
import
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908022
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -34,52 +39,128 @@
import
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908208
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
---
@@ -53,79 +78,197 @@ public
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176907925
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -34,52 +39,128 @@
import
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908172
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/trident/TridentEsTopology.java
---
@@ -38,12 +43,32
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176907879
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -34,52 +39,128 @@
import
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908038
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/bolt/EsIndexTopology.java
---
@@ -92,20 +173,37 @@ public void
Github user srdo commented on a diff in the pull request:
https://github.com/apache/storm/pull/2596#discussion_r176908124
--- Diff:
examples/storm-elasticsearch-examples/src/main/java/org/apache/storm/elasticsearch/common/EsTestUtil.java
---
@@ -33,43 +34,94 @@
import
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2588
And also, yes you can change the line ending to LF and that should work too
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2588
@SreeramGarlapati Quick google suggests that you can try adding
-Xrenormalize to the merge command. https://stackoverflow.com/a/12194759/8845188
---
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2596
@krichter722 Thanks for the fixes. I'll review this as soon as I can. In
the meantime, could you raise issues on https://issues.apache.org/jira to track
your changes? It makes it easier for us to track
Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2595
@krichter722 Thanks, merged to master. I think we don't need to track this
in a jira issue since it's not a code change.
---
set '* text=auto' in .gitattributes in order to avoid merge work because of
line feed changes
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e9c427cb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e9c427cb
Diff:
http://git-wip-us.apache.org/repos/asf/storm/blob/e9c427cb/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManagerFactory.java
--
diff --git
http://git-wip-us.apache.org/repos/asf/storm/blob/e9c427cb/external/storm-mongodb/README.md
--
diff --git a/external/storm-mongodb/README.md b/external/storm-mongodb/README.md
index b5b9e96..5c81710 100644
---
Merge branch 'gitattributes' of https://github.com/krichter722/storm into
fix-eol-to-auto
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/adf4efb7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/adf4efb7
Diff:
Repository: storm
Updated Branches:
refs/heads/master 0fdad2c0f -> adf4efb71
http://git-wip-us.apache.org/repos/asf/storm/blob/e9c427cb/external/storm-mongodb/src/main/java/org/apache/storm/mongodb/trident/state/MongoStateUpdater.java
901 - 1000 of 2639 matches
Mail list logo
