You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/04/22 22:18:05 UTC
[1/3] storm git commit: added JavaDoc for Nimubus
Repository: storm
Updated Branches:
refs/heads/master faf949275 -> b15f462cf
added JavaDoc for Nimubus
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ec1a8d3c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ec1a8d3c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ec1a8d3c
Branch: refs/heads/master
Commit: ec1a8d3c804bf9edaf905e25ba9d88542a559cc7
Parents: 496bcf7
Author: mjsax <mj...@informatik.hu-berlin.de>
Authored: Mon Apr 20 22:16:30 2015 +0200
Committer: mjsax <mj...@informatik.hu-berlin.de>
Committed: Mon Apr 20 22:16:30 2015 +0200
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/generated/Nimbus.java | 12 +++++++++++-
storm-core/src/py/storm/Nimbus.py | 8 ++++++++
storm-core/src/storm.thrift | 6 ++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ec1a8d3c/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
index 048379a..cfc4496 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-20")
public class Nimbus {
public interface Iface {
@@ -92,8 +92,18 @@ public class Nimbus {
public String getTopologyConf(String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+ /**
+ * Returns the compiled topology that contains ackers and metrics consumsers. Compare {@link #getUserTopology(String id)}.
+ *
+ * @param id
+ */
public StormTopology getTopology(String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
+ /**
+ * Returns the user specified topology as submitted originally. Compare {@link #getTopology(String id)}.
+ *
+ * @param id
+ */
public StormTopology getUserTopology(String id) throws NotAliveException, AuthorizationException, org.apache.thrift.TException;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ec1a8d3c/storm-core/src/py/storm/Nimbus.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/Nimbus.py b/storm-core/src/py/storm/Nimbus.py
index b952e3c..e9636c2 100644
--- a/storm-core/src/py/storm/Nimbus.py
+++ b/storm-core/src/py/storm/Nimbus.py
@@ -164,6 +164,8 @@ class Iface:
def getTopology(self, id):
"""
+ Returns the compiled topology that contains ackers and metrics consumsers. Compare {@link #getUserTopology(String id)}.
+
Parameters:
- id
"""
@@ -171,6 +173,8 @@ class Iface:
def getUserTopology(self, id):
"""
+ Returns the user specified topology as submitted originally. Compare {@link #getTopology(String id)}.
+
Parameters:
- id
"""
@@ -799,6 +803,8 @@ class Client(Iface):
def getTopology(self, id):
"""
+ Returns the compiled topology that contains ackers and metrics consumsers. Compare {@link #getUserTopology(String id)}.
+
Parameters:
- id
"""
@@ -834,6 +840,8 @@ class Client(Iface):
def getUserTopology(self, id):
"""
+ Returns the user specified topology as submitted originally. Compare {@link #getTopology(String id)}.
+
Parameters:
- id
"""
http://git-wip-us.apache.org/repos/asf/storm/blob/ec1a8d3c/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index b502181..560ed79 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -366,7 +366,13 @@ service Nimbus {
TopologyInfo getTopologyInfoWithOpts(1: string id, 2: GetInfoOptions options) throws (1: NotAliveException e, 2: AuthorizationException aze);
//returns json
string getTopologyConf(1: string id) throws (1: NotAliveException e, 2: AuthorizationException aze);
+ /**
+ * Returns the compiled topology that contains ackers and metrics consumsers. Compare {@link #getUserTopology(String id)}.
+ */
StormTopology getTopology(1: string id) throws (1: NotAliveException e, 2: AuthorizationException aze);
+ /**
+ * Returns the user specified topology as submitted originally. Compare {@link #getTopology(String id)}.
+ */
StormTopology getUserTopology(1: string id) throws (1: NotAliveException e, 2: AuthorizationException aze);
}
[2/3] storm git commit: Merge branch 'master' of
https://github.com/mjsax/storm into STORM-792
Posted by bo...@apache.org.
Merge branch 'master' of https://github.com/mjsax/storm into STORM-792
STORM-792: Missing documentation in backtype.storm.generated.Nimbus
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a9b26cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a9b26cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a9b26cf
Branch: refs/heads/master
Commit: 1a9b26cf564e508a8d65eda33b5ec642e23b3082
Parents: faf9492 ec1a8d3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 22 15:12:22 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Apr 22 15:12:22 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/generated/Nimbus.java | 12 +++++++++++-
storm-core/src/py/storm/Nimbus.py | 8 ++++++++
storm-core/src/storm.thrift | 6 ++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1a9b26cf/storm-core/src/storm.thrift
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-792 to Changelog
Posted by bo...@apache.org.
Added STORM-792 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b15f462c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b15f462c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b15f462c
Branch: refs/heads/master
Commit: b15f462cfacedb681281d6d50d2bda27f9ccf44f
Parents: 1a9b26c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 22 15:12:58 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Apr 22 15:12:58 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b15f462c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7d32ef..43deeb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-792: Missing documentation in backtype.storm.generated.Nimbus
* STORM-766: Include version info in the service page
* STORM-786: KafkaBolt should ack tick tuples
* STORM-791: Storm UI displays maps in the config incorrectly