Merge branch 'sprint-2' into ignite-383

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f8d524f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f8d524f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f8d524f

Branch: refs/heads/ignite-411
Commit: 0f8d524f2aea1afbe83935c1840bbc260a4922ca
Parents: 1900787 3aa606c
Author: nikolay_tikhonov <ntikho...@gridgain.com>
Authored: Thu Mar 12 10:01:58 2015 +0300
Committer: nikolay_tikhonov <ntikho...@gridgain.com>
Committed: Thu Mar 12 10:01:58 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |  13 ++-
 LICENSE.txt                                     |  54 ++++++++-
 NOTICE.txt                                      |  11 ++
 docs/hadoop_readme.md                           |  17 +++
 ipc/shmem/compile                               |   4 +
 ipc/shmem/config.guess                          |   4 +
 ipc/shmem/config.sub                            |   4 +
 ipc/shmem/depcomp                               |   4 +
 ipc/shmem/ltmain.sh                             |   3 +
 ipc/shmem/missing                               |   4 +
 modules/clients/readme.md                       |  17 +++
 .../ignite/internal/GridTaskSessionImpl.java    |   3 +-
 .../closure/GridClosureProcessor.java           |  79 +++++++------
 .../resource/GridNoImplicitInjection.java       |  25 ++++
 .../processors/resource/GridResourceField.java  |  15 ++-
 .../processors/resource/GridResourceIoc.java    |  90 +++++++-------
 .../processors/resource/GridResourceMethod.java |   3 +
 .../resource/GridResourceProcessor.java         |  55 +++------
 .../internal/util/GridConcurrentFactory.java    |  59 ----------
 .../internal/util/GridIdentityHashSet.java      |  63 ----------
 .../internal/util/GridLeanIdentitySet.java      | 117 +++++++++++++++++++
 .../ignite/internal/util/GridLeanMap.java       |   2 +-
 .../ignite/internal/util/IgniteUtils.java       |   2 +-
 .../ignite/internal/util/lang/GridFunc.java     |   2 +-
 .../org/jdk8/backport/ConcurrentHashMap8.java   |  14 +--
 modules/core/src/test/config/start-nodes.ini    |  15 +++
 .../ignite/jvmtest/ConcurrentMapTest.java       |   5 +-
 .../lang/utils/GridLeanIdentitySetSelfTest.java |  62 ++++++++++
 .../ignite/testframework/GridTestUtils.java     |  50 ++++++++
 .../testsuites/IgniteLangSelfTestSuite.java     |   1 +
 modules/winservice/README.md                    |  17 +++
 modules/yardstick/README.md                     |  17 +++
 pom.xml                                         |  21 ++--
 33 files changed, 583 insertions(+), 269 deletions(-)
----------------------------------------------------------------------


Reply via email to