ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/7] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-96' into ignite-96
Date Tue, 10 Feb 2015 13:44:02 GMT
Merge remote-tracking branch 'origin/ignite-96' into ignite-96

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.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/cbb516da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cbb516da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cbb516da

Branch: refs/heads/ignite-96-tests
Commit: cbb516daf39361d3422bb0f02e3f67971a8a48f4
Parents: e9b822d 5de4521
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Tue Feb 10 16:29:29 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Tue Feb 10 16:29:29 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiSelfTest.java |  2 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 10 -----
 .../GridCacheSwapScanQueryAbstractSelfTest.java | 41 --------------------
 3 files changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbb516da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbb516da/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------


Mime
View raw message