ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [25/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-290' into sprint-2
Date Wed, 11 Mar 2015 09:53:58 GMT
Merge remote-tracking branch 'remotes/origin/ignite-290' into sprint-2


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

Branch: refs/heads/ignite-368
Commit: 82af96cee755700912fe031a085daa6747c95398
Parents: 4da5a45 376eb29
Author: avinogradov <avinogradov@gridgain.com>
Authored: Tue Mar 10 17:52:28 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Tue Mar 10 17:52:28 2015 +0300

----------------------------------------------------------------------
 .../rest/protocols/tcp/MockNioSession.java      |  7 +-
 .../processors/cache/EvictableEntryImpl.java    |  4 +-
 .../processors/cache/GridCacheAdapter.java      |  2 +-
 .../processors/cache/GridCacheEntryEx.java      | 28 ++-----
 .../cache/GridCacheEvictionManager.java         |  2 +-
 .../processors/cache/GridCacheMapEntry.java     | 50 ++++--------
 .../processors/cache/GridCacheStoreManager.java |  2 +-
 .../processors/cache/GridCacheUtils.java        | 10 +--
 .../extras/GridCacheAttributesEntryExtras.java  | 10 ++-
 .../GridCacheAttributesMvccEntryExtras.java     | 10 ++-
 ...dCacheAttributesMvccObsoleteEntryExtras.java | 10 ++-
 ...cheAttributesMvccObsoleteTtlEntryExtras.java | 10 ++-
 .../GridCacheAttributesMvccTtlEntryExtras.java  | 10 ++-
 .../GridCacheAttributesObsoleteEntryExtras.java | 10 ++-
 ...idCacheAttributesObsoleteTtlEntryExtras.java | 10 ++-
 .../GridCacheAttributesTtlEntryExtras.java      | 10 ++-
 .../cache/extras/GridCacheEntryExtras.java      |  6 +-
 .../extras/GridCacheEntryExtrasAdapter.java     |  4 +-
 .../cache/extras/GridCacheMvccEntryExtras.java  |  4 +-
 .../GridCacheMvccObsoleteEntryExtras.java       |  4 +-
 .../GridCacheMvccObsoleteTtlEntryExtras.java    |  4 +-
 .../extras/GridCacheMvccTtlEntryExtras.java     |  4 +-
 .../extras/GridCacheObsoleteEntryExtras.java    |  4 +-
 .../extras/GridCacheObsoleteTtlEntryExtras.java |  4 +-
 .../cache/extras/GridCacheTtlEntryExtras.java   |  4 +-
 .../cache/transactions/IgniteInternalTx.java    |  6 +-
 .../cache/transactions/IgniteTxAdapter.java     |  6 +-
 .../transactions/TransactionProxyImpl.java      |  6 +-
 .../util/lang/GridMetadataAwareAdapter.java     | 71 +++++------------
 .../apache/ignite/transactions/Transaction.java |  6 +-
 .../cache/eviction/GridCacheMockEntry.java      |  5 +-
 .../nio/impl/GridNioFilterChainSelfTest.java    |  7 +-
 .../lang/GridMetadataAwareAdapterSelfTest.java  | 80 +++++++++++---------
 33 files changed, 198 insertions(+), 212 deletions(-)
----------------------------------------------------------------------



Mime
View raw message