Merge remote branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e15dbe28 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e15dbe28 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e15dbe28 Branch: refs/heads/security Commit: e15dbe281ae734e9fa46fad75b8efafadb0c2df3 Parents: 9406500 baf7e2c Author: Sean Zhong <[email protected]> Authored: Wed Nov 12 19:50:17 2014 +0800 Committer: Sean Zhong <[email protected]> Committed: Wed Nov 12 19:50:17 2014 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 1 + DEVELOPER.md | 3 ++- LICENSE | 14 +++++++++++++- storm-core/src/clj/backtype/storm/testing.clj | 2 +- storm-core/src/clj/backtype/storm/testing4j.clj | 2 +- storm-dist/binary/LICENSE | 15 +++++++++++++-- 6 files changed, 31 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
