You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/06/25 21:15:04 UTC

[1/2] storm git commit: Corrected grammar in documentation

Repository: storm
Updated Branches:
  refs/heads/master c682eb76e -> 3f819165f


Corrected grammar in documentation


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

Branch: refs/heads/master
Commit: d69a7faa7d2d30bf04a6f1f6ff584be0d41573c0
Parents: bf2ef23
Author: Ken Dombeck <kd...@jingit.com>
Authored: Thu Jun 4 16:04:11 2015 -0500
Committer: Ken Dombeck <kd...@jingit.com>
Committed: Thu Jun 4 16:04:11 2015 -0500

----------------------------------------------------------------------
 docs/documentation/Tutorial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d69a7faa/docs/documentation/Tutorial.md
----------------------------------------------------------------------
diff --git a/docs/documentation/Tutorial.md b/docs/documentation/Tutorial.md
index 3e1c016..88e77b5 100644
--- a/docs/documentation/Tutorial.md
+++ b/docs/documentation/Tutorial.md
@@ -165,7 +165,7 @@ The `prepare` method provides the bolt with an `OutputCollector` that is used fo
 
 The `execute` method receives a tuple from one of the bolt's inputs. The `ExclamationBolt` grabs the first field from the tuple and emits a new tuple with the string "!!!" appended to it. If you implement a bolt that subscribes to multiple input sources, you can find out which component the [Tuple](/javadoc/apidocs/backtype/storm/tuple/Tuple.html) came from by using the `Tuple#getSourceComponent` method.
 
-There's a few other things going in in the `execute` method, namely that the input tuple is passed as the first argument to `emit` and the input tuple is acked on the final line. These are part of Storm's reliability API for guaranteeing no data loss and will be explained later in this tutorial. 
+There's a few other things going on in the `execute` method, namely that the input tuple is passed as the first argument to `emit` and the input tuple is acked on the final line. These are part of Storm's reliability API for guaranteeing no data loss and will be explained later in this tutorial. 
 
 The `cleanup` method is called when a Bolt is being shutdown and should cleanup any resources that were opened. There's no guarantee that this method will be called on the cluster: for example, if the machine the task is running on blows up, there's no way to invoke the method. The `cleanup` method is intended for when you run topologies in [local mode](Local-mode.html) (where a Storm cluster is simulated in process), and you want to be able to run and kill many topologies without suffering any resource leaks.
 


[2/2] storm git commit: Merge branch 'documentation-fix' of https://github.com/kdombeck/storm

Posted by kn...@apache.org.
Merge branch 'documentation-fix' of https://github.com/kdombeck/storm


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

Branch: refs/heads/master
Commit: 3f819165f8d553132ce3881e7128a76817d8137b
Parents: c682eb7 d69a7fa
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Thu Jun 25 14:14:25 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Thu Jun 25 14:14:25 2015 -0500

----------------------------------------------------------------------
 docs/documentation/Tutorial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------