Merge branch 'shaded-classes2' of github.com:abhishekagarwal87/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c41e6495 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c41e6495 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c41e6495 Branch: refs/heads/1.x-branch Commit: c41e6495b4d7bb4aa7157a9c0986fdd6725efdc3 Parents: dee9aee 7ad1bff Author: P. Taylor Goetz <[email protected]> Authored: Wed Mar 23 16:12:02 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Mar 23 16:12:02 2016 -0400 ---------------------------------------------------------------------- .../org/apache/storm/hack/DefaultShader.java | 2 +- .../org/apache/storm/hack/StormShadeRequest.java | 19 ++++++++++++++++--- .../apache/storm/hack/relocation/Relocator.java | 2 ++ .../storm/hack/relocation/SimpleRelocator.java | 10 +++++++++- 4 files changed, 28 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
