ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-db-x' into ignite-db-x-10884
Date Wed, 04 May 2016 06:26:25 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-db-x-10884 9fa657164 -> 2b9b1baa5


Merge remote-tracking branch 'remotes/community/ignite-db-x' into ignite-db-x-10884

Conflicts:
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodePutGetSelfTest.java


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

Branch: refs/heads/ignite-db-x-10884
Commit: 2b9b1baa5d132318c8993e3f4ed357768dd51d42
Parents: 9fa6571
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 4 09:26:13 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 4 09:26:13 2016 +0300

----------------------------------------------------------------------
 .../query/h2/GridIndexingSpiAbstractSelfTest.java         | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2b9b1baa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index c6a8921..da4ca2b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -684,5 +684,15 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
         @Override public boolean internal() {
             return false;
         }
+
+        /** {@inheritDoc} */
+        @Override public int partition() {
+            return -1;
+        }
+
+        /** {@inheritDoc} */
+        @Override public void partition(int part) {
+            // No-op.
+        }
     }
 }
\ No newline at end of file


Mime
View raw message