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 2015/11/10 14:11:07 UTC

[1/4] storm git commit: replace nimbus.host with nimbus.seeds

Repository: storm
Updated Branches:
  refs/heads/master e25f28f71 -> 2065dcada


replace nimbus.host with nimbus.seeds

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

Branch: refs/heads/master
Commit: c804139e86010f7a845af8a0d1713d7efbe7f699
Parents: d59eaac
Author: Xin Wang <be...@163.com>
Authored: Fri Nov 6 11:31:32 2015 +0800
Committer: Xin Wang <be...@163.com>
Committed: Fri Nov 6 11:31:32 2015 +0800

----------------------------------------------------------------------
 conf/storm.yaml.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/c804139e/conf/storm.yaml.example
----------------------------------------------------------------------
diff --git a/conf/storm.yaml.example b/conf/storm.yaml.example
index 5fd35f8..4ebb329 100644
--- a/conf/storm.yaml.example
+++ b/conf/storm.yaml.example
@@ -19,7 +19,7 @@
 #     - "server1"
 #     - "server2"
 # 
-# nimbus.host: "nimbus"
+# nimbus.seeds: ["localhost"]
 # 
 # 
 # ##### These may optionally be filled in:

[4/4] storm git commit: add STORM-1185 to CHANGELOG.md

Posted by ka...@apache.org.
add STORM-1185 to CHANGELOG.md


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

Branch: refs/heads/master
Commit: 2065dcadac623e8b3bf2037ded34bc15a171734e
Parents: 93815f3
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Nov 10 22:10:40 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Nov 10 22:10:40 2015 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2065dcad/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e23d59..ae5d531 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1185: replace nimbus.host with nimbus.seeds
  * STORM-1164: Code cleanup for typos, warnings and conciseness.
  * STORM-902: Simple Log Search.
  * STORM-1052: TridentKafkaState uses new Kafka Producer API.

[3/4] storm git commit: Merge branch 'patch-8' of https://github.com/vesense/storm into STORM-1185

Posted by ka...@apache.org.
Merge branch 'patch-8' of https://github.com/vesense/storm into STORM-1185


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

Branch: refs/heads/master
Commit: 93815f386e16b8314b8b2e09f2072d8ef3a789c1
Parents: e25f28f 7cfa6e4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Nov 10 22:09:25 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Nov 10 22:09:25 2015 +0900

----------------------------------------------------------------------
 conf/storm.yaml.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[2/4] storm git commit: use multiple nimbus hosts

Posted by ka...@apache.org.
use multiple nimbus hosts

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

Branch: refs/heads/master
Commit: 7cfa6e4260536605baf0213da1c37fe2dac41bc6
Parents: c804139
Author: Xin Wang <be...@163.com>
Authored: Sat Nov 7 09:21:25 2015 +0800
Committer: Xin Wang <be...@163.com>
Committed: Sat Nov 7 09:21:25 2015 +0800

----------------------------------------------------------------------
 conf/storm.yaml.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/7cfa6e42/conf/storm.yaml.example
----------------------------------------------------------------------
diff --git a/conf/storm.yaml.example b/conf/storm.yaml.example
index 4ebb329..13c2f8e 100644
--- a/conf/storm.yaml.example
+++ b/conf/storm.yaml.example
@@ -19,7 +19,7 @@
 #     - "server1"
 #     - "server2"
 # 
-# nimbus.seeds: ["localhost"]
+# nimbus.seeds: ["host1", "host2", "host3"]
 # 
 # 
 # ##### These may optionally be filled in: