Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/406e2970 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/406e2970 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/406e2970 Branch: refs/heads/ignite-836_2 Commit: 406e29709065a934a6fde9f9f4043259e65f1503 Parents: a001312 08360c9 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue May 12 16:45:48 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue May 12 16:45:48 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 4 +- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 +++ bin/include/build-classpath.sh | 71 ++++ bin/include/target-classpath.bat | 46 --- bin/include/target-classpath.sh | 71 ---- .../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 +- .../cache/GridCacheOffheapIndexGetSelfTest.java | 111 ++++++ .../IgniteCacheWithIndexingTestSuite.java | 2 + parent/pom.xml | 2 + pom.xml | 83 ++-- 21 files changed, 458 insertions(+), 444 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/406e2970/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
