Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b378db7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b378db7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b378db7b Branch: refs/heads/ignite-6 Commit: b378db7bbeb1bed1382cd591c94221b6dbd1c5f9 Parents: 2307699 029e96b Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 29 09:33:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 29 09:33:56 2015 +0300 ---------------------------------------------------------------------- assembly/libs/readme.txt | 111 +++----- examples/config/filesystem/readme.txt | 4 +- .../hibernate/example-hibernate-L2-cache.xml | 14 +- examples/config/hibernate/readme.txt | 4 +- examples/config/servlet/readme.txt | 2 +- .../datagrid/CacheDataLoaderExample.java | 15 +- .../HibernateL2CacheExampleNodeStartup.java | 6 +- ipc/readme.txt | 4 +- ipc/shmem/readme.txt | 10 +- modules/aop/readme.txt | 12 +- modules/aws/readme.txt | 12 +- .../org/apache/ignite/internal/GridKernal.java | 30 +- .../managers/communication/GridIoManager.java | 3 +- .../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 +- .../apache/ignite/internal/util/GridUtils.java | 2 +- .../ignite/IgniteCacheAffinitySelfTest.java | 283 +++++++++++++++++++ .../apache/ignite/IgniteCacheAffinityTest.java | 283 ------------------- .../processors/cache/GridCacheTestEntryEx.java | 5 + ...ClusterMetricsSnapshotSerializeSelfTest.java | 52 +++- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- modules/core/src/test/resources/readme.txt | 2 +- modules/email/readme.txt | 12 +- modules/hadoop/readme.txt | 12 +- .../hadoop/GridHadoopClassLoader.java | 2 +- .../hadoop/GridHadoopPopularWordsTest.java | 4 +- modules/hibernate/readme.txt | 14 +- .../hibernate/GridHibernateRegionFactory.java | 10 +- modules/indexing/readme.txt | 12 +- modules/jcl/readme.txt | 12 +- modules/jta/readme.txt | 12 +- modules/log4j/readme.txt | 12 +- modules/rest-http/readme.txt | 12 +- modules/scalar/readme.txt | 8 +- modules/schedule/readme.txt | 12 +- modules/slf4j/readme.txt | 12 +- modules/spring/readme.txt | 12 +- modules/ssh/readme.txt | 12 +- modules/urideploy/readme.txt | 12 +- modules/web/readme.txt | 16 +- 56 files changed, 1231 insertions(+), 730 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b378db7b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b378db7b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ----------------------------------------------------------------------
