ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [23/24] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1139
Date Fri, 24 Jul 2015 10:36:35 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-1139


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

Branch: refs/heads/ignite-1139
Commit: 89da409d5e6a62e744c4030475bbbfcb822a103c
Parents: fd6b0e3 ed5d3ed
Author: dmagda <magda7817@gmail.com>
Authored: Fri Jul 24 08:55:26 2015 +0300
Committer: dmagda <magda7817@gmail.com>
Committed: Fri Jul 24 08:55:26 2015 +0300

----------------------------------------------------------------------
 .../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 ++--
 34 files changed, 415 insertions(+), 797 deletions(-)
----------------------------------------------------------------------



Mime
View raw message