Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8bfdce2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8bfdce2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8bfdce2 Branch: refs/heads/ignite-1093-2 Commit: d8bfdce2e3718db1d0d078539d006e960a0e95c0 Parents: f2da44d a1e5cc5 Author: Anton Vinogradov <[email protected]> Authored: Fri Oct 9 17:46:27 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Fri Oct 9 17:46:27 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 27 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../discovery/GridDiscoveryManager.java | 17 +- .../internal/portable/PortableContext.java | 7 + .../portable/api/PortableMarshaller.java | 14 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 11 +- .../distributed/near/GridNearLockFuture.java | 11 +- .../near/GridNearOptimisticTxPrepareFuture.java | 24 +- .../datastructures/DataStructuresProcessor.java | 48 +- .../processors/rest/GridRestProcessor.java | 356 ++++- .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../ignite/internal/util/GridJavaProcess.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 + .../apache/ignite/marshaller/Marshaller.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 486 ++++--- .../CacheGetFutureHangsSelfTest.java | 3 + .../CacheNoValueClassOnServerNodeTest.java | 1 + ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...gniteAtomicLongChangingTopologySelfTest.java | 155 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 71 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 129 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 + .../testframework/junits/GridAbstractTest.java | 116 +- .../junits/IgniteTestResources.java | 8 +- .../junits/common/GridCommonAbstractTest.java | 15 +- .../junits/multijvm/AffinityProcessProxy.java | 440 ++++-- .../multijvm/IgniteCacheProcessProxy.java | 1346 ++++++++++++++---- .../multijvm/IgniteClusterProcessProxy.java | 115 +- .../multijvm/IgniteEventsProcessProxy.java | 50 +- .../junits/multijvm/IgniteNodeRunner.java | 39 +- .../junits/multijvm/IgniteProcessProxy.java | 107 +- .../cache/CacheConfigurationP2PTest.java | 3 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 1 - 37 files changed, 2745 insertions(+), 912 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d8bfdce2/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ----------------------------------------------------------------------
