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/29 22:58:30 UTC
[31/50] git commit: Merge branch 'pull-179'
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/security
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