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/10/15 18:15:15 UTC
[02/50] git commit: Merge branch 'patch-1' of
http://github.com/danehammer/incubator-storm into pull-247
Merge branch 'patch-1' of http://github.com/danehammer/incubator-storm into pull-247
Conflicts:
README.markdown
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b0974a37
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b0974a37
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b0974a37
Branch: refs/heads/security
Commit: b0974a37ba4abeb834d1d1729ad11f6b4e43fa28
Parents: cfcedcf 766106a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 24 14:38:46 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 24 14:38:46 2014 -0500
----------------------------------------------------------------------
README.markdown | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b0974a37/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index fa8d539,ac99b48..3deceb9
--- a/README.markdown
+++ b/README.markdown
@@@ -170,8 -169,7 +170,9 @@@ under the License
* Dan Blanchard ([@dan-blanchard](https://github.com/dan-blanchard))
* Mykhailo "Michael" Pershyn ([@pershyn](https://github.com/pershyn))
* Dave Golombek ([@dgolombek](https://github.com/dgolombek))
+* Edison Xu ([@EdisonXu](https://github.com/EdisonXu))
+* Ariel Valentin ([@arielvalentin](http://blog.arielvalentin.com/))
+ * Dane Hammer ([@danehammer](https://github.com/danehammer))
## Acknowledgements