Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-373
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f5faf49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f5faf49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f5faf49 Branch: refs/heads/ignite-373 Commit: 0f5faf49930c136723bd302cc763633c32d434d9 Parents: 778a0a7 f6012f1 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue May 12 11:27:20 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue May 12 11:27:20 2015 +0300 ---------------------------------------------------------------------- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 - .../processors/resource/GridResourceField.java | 11 + .../processors/resource/GridResourceIoc.java | 387 ++++++------------- .../processors/resource/GridResourceMethod.java | 13 + .../resource/GridResourceProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 15 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 24 +- parent/pom.xml | 2 + pom.xml | 33 -- 9 files changed, 193 insertions(+), 298 deletions(-) ----------------------------------------------------------------------
