ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/12] incubator-ignite git commit: Merge branch 'ignite-1058' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Date Mon, 29 Jun 2015 17:49:41 GMT
Merge branch 'ignite-1058' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-gg-10298

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java


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

Branch: refs/heads/ignite-1058
Commit: e428f4245fb017808c38f599390cd9fb923cbef0
Parents: be973e2 6d26510
Author: iveselovskiy <iveselovskiy@gridgain.com>
Authored: Mon Jun 29 18:45:21 2015 +0300
Committer: iveselovskiy <iveselovskiy@gridgain.com>
Committed: Mon Jun 29 18:45:21 2015 +0300

----------------------------------------------------------------------
 .../managers/communication/GridIoManager.java   | 134 +++++++++++++++----
 .../managers/communication/GridIoMessage.java   |  15 +--
 .../managers/communication/GridIoPolicy.java    |  35 ++---
 .../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         |   2 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |   2 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   2 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   2 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   4 +-
 .../near/GridNearTxFinishRequest.java           |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../distributed/near/GridNearTxRemote.java      |   4 +-
 .../cache/transactions/IgniteInternalTx.java    |   2 +-
 .../cache/transactions/IgniteTxAdapter.java     |  10 +-
 .../transactions/IgniteTxLocalAdapter.java      |   2 +-
 .../internal/processors/igfs/IgfsContext.java   |   5 +-
 .../plugin/IgnitePluginProcessor.java           |   2 +-
 .../communication/IoPoolExtension.java          |  47 +++++++
 .../communication/GridIoManagerSelfTest.java    |   2 +-
 .../cache/IgniteInternalCacheTypesTest.java     |   3 +-
 25 files changed, 220 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e428f424/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------


Mime
View raw message