Merge branch 'STORM-1660' of github.com:vesense/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ba77a1b2 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ba77a1b2 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ba77a1b2 Branch: refs/heads/master Commit: ba77a1b209aab88b50940e578dc215bbfd175616 Parents: e14f429 29d4ba0 Author: P. Taylor Goetz <[email protected]> Authored: Wed Mar 30 15:52:41 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Mar 30 15:52:41 2016 -0400 ---------------------------------------------------------------------- .gitignore | 33 +++++++++++++++++++++++---------- external/flux/.gitignore | 15 --------------- 2 files changed, 23 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
