ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Date Thu, 29 Jan 2015 10:42:28 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-112 4c1e6e66a -> 0a800b1ac


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


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

Branch: refs/heads/ignite-112
Commit: 6cab420e72bada8a9658ce893faec00710e08cd4
Parents: 8643e94 ddbd18e
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Jan 28 19:20:46 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Jan 28 19:20:46 2015 +0300

----------------------------------------------------------------------
 .../datagrid/CacheDataLoaderExample.java        |  15 +-
 .../org/apache/ignite/internal/GridKernal.java  |  30 +--
 .../processors/cache/GridCacheContext.java      |  43 +++++
 .../processors/cache/GridCacheEntryEx.java      |   8 +
 .../processors/cache/GridCacheMapEntry.java     | 116 +++++++++---
 .../cache/GridCacheUpdateAtomicResult.java      |   6 +-
 .../processors/cache/GridDrResolveResult.java   |  63 -------
 .../GridDistributedTxRemoteAdapter.java         |  47 +++--
 .../dht/atomic/GridDhtAtomicCache.java          |  10 +-
 .../processors/cache/dr/GridCacheDrManager.java |  57 ++----
 .../cache/dr/os/GridOsCacheDrManager.java       |  35 +---
 .../cache/transactions/IgniteTxAdapter.java     |  45 +++++
 .../transactions/IgniteTxLocalAdapter.java      |  52 +++--
 ...ridCacheVersionAbstractConflictResolver.java |  56 ++++++
 .../GridCacheVersionConflictContext.java        |  73 +++++++
 .../GridCacheVersionConflictContextImpl.java    | 188 +++++++++++++++++++
 .../GridCacheVersionConflictResolver.java       |  59 ++++++
 .../version/GridCacheVersionedEntryEx.java      |   2 +-
 .../dataload/IgniteDataLoaderImpl.java          |  29 ++-
 .../processors/cache/GridCacheTestEntryEx.java  |   5 +
 ...ClusterMetricsSnapshotSerializeSelfTest.java |  52 ++++-
 21 files changed, 760 insertions(+), 231 deletions(-)
----------------------------------------------------------------------



Mime
View raw message