You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/07/10 16:59:23 UTC
[04/12] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-7' into ignite-1067
Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1067
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea3525ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea3525ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea3525ea
Branch: refs/heads/ignite-1.3
Commit: ea3525ea6c06f3b3b876ed78febded4fda2e5134
Parents: d268375 b437ec7
Author: Anton <av...@gridgain.com>
Authored: Thu Jul 2 13:39:14 2015 +0300
Committer: Anton <av...@gridgain.com>
Committed: Thu Jul 2 13:39:14 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 1 -
.../managers/communication/GridIoManager.java | 124 +++++++++++++++----
.../managers/communication/GridIoMessage.java | 15 ++-
.../managers/communication/GridIoPolicy.java | 32 ++---
.../eventstorage/GridEventStorageManager.java | 2 +-
.../internal/processors/cache/CacheType.java | 8 +-
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheIoManager.java | 12 +-
.../GridDistributedTxFinishRequest.java | 11 +-
.../GridDistributedTxPrepareRequest.java | 9 +-
.../GridDistributedTxRemoteAdapter.java | 3 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 3 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 3 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 3 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 5 +-
.../near/GridNearTxFinishRequest.java | 3 +-
.../cache/distributed/near/GridNearTxLocal.java | 3 +-
.../distributed/near/GridNearTxRemote.java | 5 +-
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 11 +-
.../transactions/IgniteTxLocalAdapter.java | 3 +-
.../internal/processors/igfs/IgfsContext.java | 5 +-
.../plugin/IgnitePluginProcessor.java | 3 +-
.../plugin/extensions/communication/IoPool.java | 42 +++++++
.../ignite/spi/discovery/tcp/ClientImpl.java | 5 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 5 +-
.../TcpDiscoveryMulticastIpFinder.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 2 +-
.../cache/IgniteInternalCacheTypesTest.java | 3 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 32 ++---
.../deployment/uri/tasks/gar-spring-bean.xml | 30 ++---
modules/urideploy/pom.xml | 14 ---
32 files changed, 240 insertions(+), 166 deletions(-)
----------------------------------------------------------------------