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 2017/04/12 17:28:22 UTC
[1/2] storm git commit: fix yaml front matter for kafka documentation
Repository: storm
Updated Branches:
refs/heads/1.x-branch a61a828ea -> d185367fb
fix yaml front matter for kafka documentation
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1f502793
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1f502793
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1f502793
Branch: refs/heads/1.x-branch
Commit: 1f502793181addb65571fca1890c0df843b463db
Parents: b04ff48
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Mar 30 11:44:06 2017 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Mar 30 11:44:06 2017 -0400
----------------------------------------------------------------------
docs/storm-kafka-client.md | 5 +++++
docs/storm-kafka.md | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1f502793/docs/storm-kafka-client.md
----------------------------------------------------------------------
diff --git a/docs/storm-kafka-client.md b/docs/storm-kafka-client.md
index 215f60f..d1776d2 100644
--- a/docs/storm-kafka-client.md
+++ b/docs/storm-kafka-client.md
@@ -1,3 +1,8 @@
+---
+title: Storm Kafka Integration (0.10.x+)
+layout: documentation
+documentation: true
+---
#Storm Apache Kafka integration using the kafka-client jar
This includes the new Apache Kafka consumer API.
http://git-wip-us.apache.org/repos/asf/storm/blob/1f502793/docs/storm-kafka.md
----------------------------------------------------------------------
diff --git a/docs/storm-kafka.md b/docs/storm-kafka.md
index 37ab05a..c69845d 100644
--- a/docs/storm-kafka.md
+++ b/docs/storm-kafka.md
@@ -1,5 +1,5 @@
---
-title: Storm Kafka Integration
+title: Storm Kafka Integration (0.8.x)
layout: documentation
documentation: true
---
[2/2] storm git commit: Merge branch '1.x-branch' of
https://git-wip-us.apache.org/repos/asf/storm into 1.x-branch
Posted by pt...@apache.org.
Merge branch '1.x-branch' of https://git-wip-us.apache.org/repos/asf/storm 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/d185367f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d185367f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d185367f
Branch: refs/heads/1.x-branch
Commit: d185367fb2ed134c9cc8ddd666e786d540b3a182
Parents: 1f50279 a61a828
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 12 13:28:13 2017 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 12 13:28:13 2017 -0400
----------------------------------------------------------------------
CHANGELOG.md | 9 +++++++-
README.markdown | 1 +
bin/storm-config.cmd | 10 +++++++++
docs/Setting-up-a-Storm-cluster.md | 13 ++++++------
docs/distcache-blobstore.md | 4 ++--
.../spout/trident/KafkaTridentSpoutEmitter.java | 14 +++++++++----
pom.xml | 9 ++++++++
.../clj/org/apache/storm/daemon/executor.clj | 6 ++++--
storm-core/src/jvm/org/apache/storm/Config.java | 20 +++++++++---------
.../apache/storm/localizer/AsyncLocalizer.java | 6 +++---
.../org/apache/storm/TestConfigValidate.java | 22 +++++++++++++++++++-
11 files changed, 85 insertions(+), 29 deletions(-)
----------------------------------------------------------------------