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 2014/07/24 23:13:14 UTC

[1/4] git commit: Clarify working directory for example commands

Repository: incubator-storm
Updated Branches:
  refs/heads/master 2e7b1d454 -> 07a561aee


Clarify working directory for example commands


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

Branch: refs/heads/master
Commit: 1b2ea79e77a54ff1195d75adf52e0c13ec4544d8
Parents: 8da9572
Author: Jo Liss <jo...@gmail.com>
Authored: Tue Jul 8 14:18:59 2014 +0000
Committer: Jo Liss <jo...@gmail.com>
Committed: Tue Jul 8 14:18:59 2014 +0000

----------------------------------------------------------------------
 examples/storm-starter/README.markdown | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/1b2ea79e/examples/storm-starter/README.markdown
----------------------------------------------------------------------
diff --git a/examples/storm-starter/README.markdown b/examples/storm-starter/README.markdown
index 283f85d..276de99 100644
--- a/examples/storm-starter/README.markdown
+++ b/examples/storm-starter/README.markdown
@@ -74,6 +74,9 @@ of Storm in this local Maven repository at `$HOME/.m2/repository`.
 
 ## Running topologies with Maven
 
+Note: All following examples require that you run `cd examples/storm-starter`
+beforehand.
+
 storm-starter topologies can be run with the maven-exec-plugin. For example, to
 compile and run `WordCountTopology` in local mode, use the command:
 


[3/4] git commit: Updated README for pull 179

Posted by bo...@apache.org.
Updated README for pull 179


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

Branch: refs/heads/master
Commit: 9b3cb1830489cc4f629d5fa38cf7ab2181475c4f
Parents: 4ac8dc3
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Jul 24 16:11:24 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Jul 24 16:11:24 2014 -0500

----------------------------------------------------------------------
 README.markdown                                     | 1 +
 storm-core/test/clj/backtype/storm/cluster_test.clj | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/9b3cb183/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 341b62c..5e89333 100644
--- a/README.markdown
+++ b/README.markdown
@@ -155,6 +155,7 @@ under the License.
 * Masatake Iwasaki ([@iwasakims](https://github.com/iwasakims))
 * Milad Fatenejad ([@icksa](https://github.com/icksa))
 * Ryan Liu ([@shell0dh](https://github.com/shell0dh))
+* Jo Liss ([@joliss](https://github.com/joliss))
 
 ## Acknowledgements
 

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/9b3cb183/storm-core/test/clj/backtype/storm/cluster_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/cluster_test.clj b/storm-core/test/clj/backtype/storm/cluster_test.clj
index a6bb10e..63efd30 100644
--- a/storm-core/test/clj/backtype/storm/cluster_test.clj
+++ b/storm-core/test/clj/backtype/storm/cluster_test.clj
@@ -208,8 +208,9 @@
       (let [state (mk-storm-state zk-port)]
         (.report-error state "a" "1"(local-hostname) 6700  (RuntimeException.))
         (validate-errors! state "a" "1" ["RuntimeException"])
+        (advance-time-secs! 1)
         (.report-error state "a" "1" (local-hostname) 6700 (IllegalArgumentException.))
-        (validate-errors! state "a" "1" ["RuntimeException" "IllegalArgumentException"])
+        (validate-errors! state "a" "1" ["IllegalArgumentException" "RuntimeException"])
         (doseq [i (range 10)]
           (.report-error state "a" "2" (local-hostname) 6700 (RuntimeException.))
           (advance-time-secs! 2))


[4/4] git commit: Merge branch 'pull-179'

Posted by bo...@apache.org.
Merge branch 'pull-179'

Conflicts:
	README.markdown


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

Branch: refs/heads/master
Commit: 07a561aeec294bd92e15d155c5e1249c1bb0d5d5
Parents: 2e7b1d4 9b3cb18
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Jul 24 16:12:44 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Jul 24 16:12:44 2014 -0500

----------------------------------------------------------------------
 README.markdown                                     | 1 +
 examples/storm-starter/README.markdown              | 3 +++
 storm-core/test/clj/backtype/storm/cluster_test.clj | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/07a561ae/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index 64b8825,5e89333..2a6afbf
--- a/README.markdown
+++ b/README.markdown
@@@ -155,7 -155,7 +155,8 @@@ under the License
  * Masatake Iwasaki ([@iwasakims](https://github.com/iwasakims))
  * Milad Fatenejad ([@icksa](https://github.com/icksa))
  * Ryan Liu ([@shell0dh](https://github.com/shell0dh))
 +* Dave Parfitt ([@metadave](https://github.com/metadave))
+ * Jo Liss ([@joliss](https://github.com/joliss))
  
  ## Acknowledgements
  


[2/4] git commit: Merge branch 'storm-starter-readme' of https://github.com/joliss/incubator-storm into pull-179

Posted by bo...@apache.org.
Merge branch 'storm-starter-readme' of https://github.com/joliss/incubator-storm into pull-179


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

Branch: refs/heads/master
Commit: 4ac8dc3ed127134d6e8ff7d379bcabf083fef3b7
Parents: 7ac24b8 1b2ea79
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Jul 24 16:09:37 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Jul 24 16:09:37 2014 -0500

----------------------------------------------------------------------
 examples/storm-starter/README.markdown | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------