ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-3' into ignite-645
Date Tue, 31 Mar 2015 15:44:45 GMT
Merge branch 'ignite-sprint-3' into ignite-645

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.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/a17175c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a17175c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a17175c0

Branch: refs/heads/ignite-645
Commit: a17175c097189a20a1cb5aa3a98b2ea22ad1ca40
Parents: 2cd7c86 07683c9
Author: Andrey Gura <agura@gridgain.com>
Authored: Tue Mar 31 14:37:34 2015 +0300
Committer: Andrey Gura <agura@gridgain.com>
Committed: Tue Mar 31 14:37:34 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   6 +
 modules/core/pom.xml                            |   7 +-
 .../ignite/internal/GridKernalContextImpl.java  |   3 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   5 +-
 .../cache/CacheConflictResolutionManager.java   |  30 ++
 .../cache/CacheOsConflictResolutionManager.java |  58 ++++
 .../processors/cache/CacheProjection.java       |  24 --
 .../processors/cache/GridCacheAdapter.java      |  60 ----
 .../processors/cache/GridCacheContext.java      |  19 +-
 .../processors/cache/GridCacheProcessor.java    |  20 +-
 .../processors/cache/GridCacheProjectionEx.java |   9 -
 .../cache/GridCacheProjectionImpl.java          | 285 +++----------------
 .../processors/cache/GridCacheProxyImpl.java    |  19 --
 .../processors/cache/IgniteCacheProxy.java      |   2 -
 .../CacheDataStructuresManager.java             |   4 +-
 .../processors/cache/dr/GridCacheDrManager.java |   5 -
 .../cache/dr/GridOsCacheDrManager.java          | 106 +++++++
 .../cache/dr/os/GridOsCacheDrManager.java       | 111 --------
 .../cache/query/GridCacheQueriesImpl.java       |  23 +-
 .../version/CacheVersionConflictResolver.java   |  40 +++
 ...ridCacheVersionAbstractConflictResolver.java |  56 ----
 .../GridCacheVersionConflictResolver.java       |  59 ----
 .../cache/VisorCacheStoreConfiguration.java     |  18 +-
 .../GridProjectionForCachesSelfTest.java        |  12 +-
 .../cache/IgniteCacheDynamicStopSelfTest.java   |  19 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   2 +
 .../GridServiceReassignmentSelfTest.java        |   5 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   6 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |   7 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   3 +-
 parent/pom.xml                                  |  41 +--
 32 files changed, 365 insertions(+), 703 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a17175c0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index ceed8ce,5526f51..c55f02a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@@ -25,9 -25,7 +25,6 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.cache.transactions.*;
  import org.apache.ignite.internal.processors.cache.version.*;
- import org.apache.ignite.internal.util.*;
--import org.apache.ignite.internal.util.future.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

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


Mime
View raw message