Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-157
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab1f9dd2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab1f9dd2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab1f9dd2 Branch: refs/heads/ignite-836_2 Commit: ab1f9dd278a1c1e42cf36b21a2bedcd2f7e4129e Parents: 250dd8e f6012f1 Author: sboikov <sboi...@gridgain.com> Authored: Tue May 12 09:05:47 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue May 12 09:05:47 2015 +0300 ---------------------------------------------------------------------- .../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 -- 8 files changed, 193 insertions(+), 296 deletions(-) ----------------------------------------------------------------------
