Merge branch 'master' of github.com:apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8be5417c Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8be5417c Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8be5417c Branch: refs/heads/master Commit: 8be5417c8db89ec74dae1f41589a95d95c5c6aac Parents: 3812b2f 2f1411d Author: xiaojian.fxj <[email protected]> Authored: Thu Mar 31 09:21:47 2016 +0800 Committer: xiaojian.fxj <[email protected]> Committed: Thu Mar 31 09:21:47 2016 +0800 ---------------------------------------------------------------------- .gitignore | 33 +++++++++++++++++++++++---------- CHANGELOG.md | 1 + external/flux/.gitignore | 15 --------------- 3 files changed, 24 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
