ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [5/5] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-283
Date Thu, 19 Feb 2015 12:56:13 GMT
Merge branch 'sprint-2' into ignite-283

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java


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

Branch: refs/heads/ignite-283-tx
Commit: d0ba20a58522925ea1107cacaa243fd767ecc58f
Parents: fc29285 0cd2313
Author: vozerov <vozerov@gridgain.com>
Authored: Thu Feb 19 15:52:25 2015 +0300
Committer: vozerov <vozerov@gridgain.com>
Committed: Thu Feb 19 15:52:25 2015 +0300

----------------------------------------------------------------------
 .../IgniteCacheExpiryStoreLoadSelfTest.java     | 79 +++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



Mime
View raw message