Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e81867b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e81867b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e81867b6 Branch: refs/heads/ignite-752 Commit: e81867b6756677138f3efb10dd77a67ebfd2a0f0 Parents: f714fd0 ae148f1 Author: dmagda <magda7...@gmail.com> Authored: Fri Jul 24 13:49:17 2015 +0300 Committer: dmagda <magda7...@gmail.com> Committed: Fri Jul 24 13:49:17 2015 +0300 ---------------------------------------------------------------------- modules/clients/README.txt | 16 + modules/clients/readme.md | 32 -- modules/clients/readme.pdf | Bin 47887 -> 0 bytes .../rest/protocols/tcp/MockNioSession.java | 15 - .../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 5 + .../cache/CacheEvictableEntryImpl.java | 2 +- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 32 +- .../cache/GridCacheEvictionManager.java | 12 +- .../processors/cache/GridCacheMapEntry.java | 208 +------------ .../processors/cache/GridCacheUtils.java | 18 +- .../extras/GridCacheAttributesEntryExtras.java | 37 +-- .../GridCacheAttributesMvccEntryExtras.java | 35 +-- ...dCacheAttributesMvccObsoleteEntryExtras.java | 35 +-- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 35 +-- .../GridCacheAttributesMvccTtlEntryExtras.java | 35 +-- .../GridCacheAttributesObsoleteEntryExtras.java | 36 +-- ...idCacheAttributesObsoleteTtlEntryExtras.java | 36 +-- .../GridCacheAttributesTtlEntryExtras.java | 36 +-- .../cache/extras/GridCacheEntryExtras.java | 14 - .../extras/GridCacheEntryExtrasAdapter.java | 8 - .../cache/extras/GridCacheMvccEntryExtras.java | 8 - .../GridCacheMvccObsoleteEntryExtras.java | 8 - .../GridCacheMvccObsoleteTtlEntryExtras.java | 9 - .../extras/GridCacheMvccTtlEntryExtras.java | 8 - .../extras/GridCacheObsoleteEntryExtras.java | 8 - .../extras/GridCacheObsoleteTtlEntryExtras.java | 9 - .../cache/extras/GridCacheTtlEntryExtras.java | 8 - .../store/GridCacheStoreManagerAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 16 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../util/lang/GridMetadataAwareAdapter.java | 296 +++++++++---------- .../cache/eviction/GridCacheMockEntry.java | 12 +- .../nio/impl/GridNioFilterChainSelfTest.java | 15 - .../GridMetadataAwareAdapterLoadSelfTest.java | 135 +++++++++ .../lang/GridMetadataAwareAdapterSelfTest.java | 58 ++-- modules/hadoop/docs/HADOOP_README.txt | 122 ++++++++ modules/hadoop/docs/hadoop_readme.md | 135 --------- modules/hadoop/docs/hadoop_readme.pdf | Bin 82219 -> 0 bytes modules/yardstick/README.md | 85 ------ modules/yardstick/README.txt | 93 ++++++ parent/pom.xml | 2 + 43 files changed, 648 insertions(+), 1049 deletions(-) ----------------------------------------------------------------------
