ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ivasilin...@apache.org
Subject [28/29] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Date Tue, 21 Jul 2015 11:25:22 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-961


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

Branch: refs/heads/ignite-961
Commit: 4e2f26b799d099f5ef99a97108f53eeb12e48b96
Parents: 72b91c1 83bba05
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Tue Jul 21 13:52:35 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Tue Jul 21 13:52:35 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |  2 +-
 .../processors/cache/IgniteCacheProxy.java      |  2 +-
 .../processors/cache/IgniteInternalCache.java   |  1 +
 .../distributed/dht/GridDhtTxPrepareFuture.java | 16 ++--
 .../ignite/internal/util/IgniteUtils.java       | 25 ++++--
 .../ignite/internal/util/nio/GridNioServer.java |  9 ++
 .../util/nio/GridSelectorNioSessionImpl.java    |  8 ++
 .../IgniteClientReconnectFailoverTest.java      |  6 ++
 .../cache/CacheAffinityCallSelfTest.java        | 10 ++-
 .../IgniteCachePutRetryAbstractSelfTest.java    | 52 +++++++-----
 ...gniteCachePutRetryTransactionalSelfTest.java | 17 ++--
 ...achePartitionedMultiNodeFullApiSelfTest.java |  4 +-
 .../internal/util/nio/GridNioSelfTest.java      | 88 ++++++++++++++++++--
 .../internal/util/nio/GridNioSslSelfTest.java   | 16 ++--
 .../testframework/junits/GridAbstractTest.java  |  3 +-
 pom.xml                                         | 12 +--
 16 files changed, 199 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e2f26b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e2f26b7/pom.xml
----------------------------------------------------------------------


Mime
View raw message