Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6012f1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6012f1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6012f1e Branch: refs/heads/ignite-648 Commit: f6012f1e802be3ade9efd53d79ec6b85df5a4c8c Parents: e6ca757 f4a3591 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri May 8 18:54:49 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri May 8 18:54:49 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 +- 6 files changed, 191 insertions(+), 263 deletions(-) ----------------------------------------------------------------------
