You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/04/20 15:02:22 UTC
[4/4] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-db' into ignite-db-x-10884
Merge remote-tracking branch 'remotes/community/ignite-db' into ignite-db-x-10884
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRow.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/io/FreeIO.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheH2DatabaseManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38ead2a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38ead2a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38ead2a7
Branch: refs/heads/ignite-db-x-10884
Commit: 38ead2a78876ef8cdba0c3aed162768db3036e53
Parents: 3c64b80 b66c1ec
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 20 16:02:04 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 20 16:02:04 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 8 +++--
.../cache/GridCacheClearAllRunnable.java | 3 ++
.../IgniteDbSingleNodePutGetSelfTest.java | 37 ++++++++++++++++++++
3 files changed, 46 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38ead2a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38ead2a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38ead2a7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodePutGetSelfTest.java
----------------------------------------------------------------------