Merge branches 'ignite-973-2' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0a31e22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0a31e22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0a31e22 Branch: refs/heads/ignite-950 Commit: a0a31e221b215a3ac0477d083064200991c241e2 Parents: cbbb6a1 c866902 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Jul 2 10:56:22 2015 -0700 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Jul 2 10:56:22 2015 -0700 ---------------------------------------------------------------------- .../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 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../extdata/uri/modules/uri-dependency/pom.xml | 30 ++--- .../deployment/uri/tasks/gar-spring-bean.xml | 30 ++--- modules/urideploy/pom.xml | 14 --- 33 files changed, 239 insertions(+), 167 deletions(-) ----------------------------------------------------------------------
