ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [10/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-91
Date Mon, 02 Feb 2015 10:28:46 GMT
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-91


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

Branch: refs/heads/ignite-16
Commit: a92f08456d85ccc5fcb1f9f9ec670795b45ddd6a
Parents: 27827c8 6cab420
Author: sboikov <semen.boikov@inria.fr>
Authored: Wed Jan 28 21:42:56 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Wed Jan 28 21:42:56 2015 +0300

----------------------------------------------------------------------
 .../hibernate/example-hibernate-L2-cache.xml    |  14 +-
 .../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 ++-
 .../apache/ignite/internal/util/GridUtils.java  |   2 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   5 +
 ...ClusterMetricsSnapshotSerializeSelfTest.java |  52 ++++-
 .../hibernate/GridHibernateRegionFactory.java   |  10 +-
 24 files changed, 773 insertions(+), 244 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a92f0845/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------


Mime
View raw message