Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

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

Branch: refs/heads/ignite-1924
Commit: ab8298afe65973750abe40f402246c77283955ba
Parents: bcfe78b 8e7e330
Author: Anton Vinogradov <avinogra...@gridgain.com>
Authored: Fri Nov 20 18:17:49 2015 +0300
Committer: Anton Vinogradov <avinogra...@gridgain.com>
Committed: Fri Nov 20 18:17:49 2015 +0300

----------------------------------------------------------------------
 .../datastructures/IgniteSemaphoreExample.java  | 168 ++++
 .../ignite/examples/CacheExamplesSelfTest.java  |  10 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  17 +
 .../java/org/apache/ignite/IgniteSemaphore.java | 312 ++++++++
 .../apache/ignite/events/DiscoveryEvent.java    |   6 +-
 .../apache/ignite/internal/IgniteKernal.java    |  21 +
 .../datastructures/DataStructuresProcessor.java | 199 ++++-
 .../datastructures/GridCacheSemaphoreEx.java    |  47 ++
 .../datastructures/GridCacheSemaphoreImpl.java  | 763 +++++++++++++++++++
 .../datastructures/GridCacheSemaphoreState.java | 144 ++++
 .../IgniteClientReconnectAtomicsTest.java       |  44 +-
 ...eAbstractDataStructuresFailoverSelfTest.java | 275 ++++++-
 .../IgniteClientDataStructuresAbstractTest.java |  59 +-
 .../IgniteDataStructureUniqueNameTest.java      |  14 +-
 .../IgniteSemaphoreAbstractSelfTest.java        | 411 ++++++++++
 .../local/IgniteLocalSemaphoreSelfTest.java     |  98 +++
 .../IgnitePartitionedSemaphoreSelfTest.java     |  33 +
 ...eplicatedDataStructuresFailoverSelfTest.java |   2 +-
 .../IgniteReplicatedSemaphoreSelfTest.java      |  33 +
 .../cache/GridCacheDataStructuresLoadTest.java  | 283 ++++---
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../junits/multijvm/IgniteProcessProxy.java     |   7 +
 .../org/apache/ignite/IgniteSpringBean.java     |  12 +
 23 files changed, 2837 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


Reply via email to