Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e28ddd26 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e28ddd26 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e28ddd26 Branch: refs/heads/ignite-32 Commit: e28ddd260fbe64568445b5a9d116e60a099fdcb2 Parents: ee0ec68 673d11b Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jan 29 10:32:50 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jan 29 10:32:50 2015 +0700 ---------------------------------------------------------------------- .../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 +++++++++--- .../processors/cache/GridCacheStoreManager.java | 18 +- .../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 ++++- .../hibernate/GridHibernateRegionFactory.java | 10 +- 24 files changed, 781 insertions(+), 252 deletions(-) ----------------------------------------------------------------------
