You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/28 14:29:52 UTC

[3/5] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218

Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218


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

Branch: refs/heads/ignite-218-hdfs-only
Commit: bfad5ae454e978ec0b3ce40942f6728c0b741ab8
Parents: c062bac 0ee2799
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Apr 23 12:06:07 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Apr 23 12:06:07 2015 +0300

----------------------------------------------------------------------
 .../configuration/IgniteConfiguration.java      | 107 +++++++++++++++++++
 .../org/apache/ignite/internal/IgnitionEx.java  |   8 +-
 .../connection/GridClientNioTcpConnection.java  |   9 +-
 .../discovery/GridDiscoveryManager.java         |  18 +++-
 .../cache/GridCacheAffinityManager.java         |  12 ---
 .../processors/cache/IgniteCacheProxy.java      |  15 ++-
 .../cache/affinity/GridCacheAffinityImpl.java   |   2 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |   2 +-
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |   2 +-
 .../IgniteCacheObjectProcessorImpl.java         |   2 +-
 .../processors/job/GridJobProcessor.java        |   6 ++
 .../cache/GridCacheAbstractFullApiSelfTest.java |   4 +-
 .../IgniteCachePutGetRestartAbstractTest.java   |   2 +-
 ...arDisabledFairAffinityPutGetRestartTest.java |  35 ++++++
 ...acheSortedEvictionPolicyPerformanceTest.java |  13 ++-
 .../IgniteCacheFailoverTestSuite.java           |   3 +-
 pom.xml                                         |  14 +--
 19 files changed, 207 insertions(+), 51 deletions(-)
----------------------------------------------------------------------