Merge branch 'master' into asf-site

Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/commit/f429ae10
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/f429ae10
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/f429ae10

Branch: refs/heads/asf-site
Commit: f429ae108c25b219926a7afadeae557ce90a7034
Parents: 9677369 a96c9d0
Author: yukon <[email protected]>
Authored: Mon Jan 9 17:53:23 2017 +0800
Committer: yukon <[email protected]>
Committed: Mon Jan 9 17:53:23 2017 +0800

----------------------------------------------------------------------
 README.md                                       |   8 ++--
 .../2017-01-05-launch-rocketmq-code-marathon.md |  45 +++++++++++++++++++
 .../launch-rocketmq-code-marathon.pdf           | Bin 0 -> 135771 bytes
 assets/images/blog/banner.jpg                   | Bin 0 -> 96315 bytes
 4 files changed, 49 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to