ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [4/4] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-386
Date Mon, 02 Mar 2015 15:01:20 GMT
Merge branch 'sprint-2' into ignite-386


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

Branch: refs/heads/ignite-386
Commit: d03317c5ebfd4b34cbd9d9dea33b6c88124b05f6
Parents: 6dbf295 235758c
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Mar 2 18:01:13 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Mar 2 18:01:13 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCluster.java   |   8 +-
 .../configuration/IgniteConfiguration.java      |   5 +-
 .../ignite/internal/GridKernalContext.java      |  10 +-
 .../ignite/internal/GridKernalContextImpl.java  |  14 +-
 .../apache/ignite/internal/IgniteKernal.java    |  23 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 592 +++++++++----------
 .../affinity/GridAffinityAssignmentCache.java   |  13 +-
 .../processors/cache/CacheMetricsImpl.java      |   4 +
 .../processors/cache/GridCacheContext.java      |  19 +
 .../processors/cache/GridCacheProcessor.java    |  15 +
 .../processors/cache/GridCacheStoreManager.java |  12 +-
 .../GridDistributedCacheAdapter.java            |   2 +
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   2 +-
 .../cache/transactions/IgniteTxManager.java     |   7 +-
 .../processors/cluster/ClusterProcessor.java    |  46 ++
 .../dataload/IgniteDataLoaderImpl.java          |  29 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |  42 ++
 ...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++++++
 ...dCacheAtomicUsersAffinityMapperSelfTest.java |  45 ++
 ...heReplicatedUsersAffinityMapperSelfTest.java |  45 ++
 .../GridCacheTxUsersAffinityMapperSelfTest.java |  45 ++
 .../GridCacheQueueCleanupSelfTest.java          |   1 -
 23 files changed, 820 insertions(+), 368 deletions(-)
----------------------------------------------------------------------



Mime
View raw message