ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [10/12] incubator-ignite git commit: Merge branches 'ignite-sql-tests' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Date Mon, 09 Feb 2015 20:39:23 GMT
Merge branches 'ignite-sql-tests' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sql-tests


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

Branch: refs/heads/ignite-sql-tests
Commit: dd3e77253ec252fd58a2fd52295ed08926d5bd5a
Parents: 571223f cfa2652
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Mon Feb 9 23:30:37 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Mon Feb 9 23:30:37 2015 +0300

----------------------------------------------------------------------
 .../datastructures/IgniteQueueExample.java      |  2 +-
 .../datastructures/IgniteSetExample.java        |  2 +-
 .../DataStructureRemovedException.java          | 61 --------------------
 .../cache/GridCacheProjectionImpl.java          |  2 +-
 .../processors/cache/GridCacheUtils.java        |  6 +-
 .../datastructures/GridCacheAtomicLongImpl.java |  7 +--
 .../GridCacheAtomicReferenceImpl.java           |  7 +--
 .../GridCacheAtomicSequenceImpl.java            |  7 +--
 .../GridCacheAtomicStampedImpl.java             |  7 +--
 .../datastructures/GridCacheQueueAdapter.java   |  9 ++-
 .../datastructures/GridCacheSetImpl.java        |  5 +-
 .../datastructures/GridCacheSetProxy.java       |  3 +-
 .../org/apache/ignite/lang/IgniteBiTuple.java   |  4 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      | 22 +++----
 ...eJdbcStoreAbstractMultithreadedSelfTest.java | 36 ++++++------
 ...CacheAtomicReferenceApiSelfAbstractTest.java |  3 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |  3 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  4 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  3 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |  3 +-
 .../GridCacheSetAbstractSelfTest.java           |  9 ++-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |  3 +-
 22 files changed, 69 insertions(+), 139 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3e7725/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3e7725/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index 085ab03,46b4f0e..7e68ca4
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@@ -20,8 -20,8 +20,7 @@@ package org.apache.ignite.internal.proc
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
- import org.apache.ignite.datastructures.*;
  import org.apache.ignite.internal.processors.cache.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.util.*;


Mime
View raw message