Merge branch 'ignite-sprint-3' into ignite-gg-9973
Conflicts:
modules/core/src/main/resources/META-INF/classnames.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db2eb602
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db2eb602
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db2eb602
Branch: refs/heads/ignite-gg-9973
Commit: db2eb60296d908a2a596b7e48a2f3c12a1630cbf
Parents: d8faed2 07ca9fa
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Thu Apr 2 16:00:54 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Thu Apr 2 16:00:54 2015 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 1 -
ipc/shmem/README.txt | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../visor/cache/VisorCacheConfiguration.java | 81 +++++--------
.../cache/VisorCacheNearConfiguration.java | 11 +-
.../visor/node/VisorGridConfiguration.java | 28 ++++-
.../internal/visor/util/VisorMimeTypes.java | 4 +-
.../resources/META-INF/classnames.properties | 79 ++++---------
.../processors/igfs/IgsfStartCacheTest.java | 115 +++++++++++++++++++
.../GridUriDeploymentFileResourceLoader.java | 2 +-
10 files changed, 208 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db2eb602/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db2eb602/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --cc modules/core/src/main/resources/META-INF/classnames.properties
index 8bb4d5c,55c1f9d..d7213a4
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@@ -432,11 -433,9 +433,9 @@@ org.apache.ignite.internal.processors.c
org.apache.ignite.internal.processors.cache.GridCacheUtils$9
org.apache.ignite.internal.processors.cache.GridCacheValueCollection
org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1
-org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StatefulValue
-org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StoreOperation
-org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$ValueStatus
+org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StatefulValue
+org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$StoreOperation
+org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore$ValueStatus
- org.apache.ignite.internal.processors.cache.GridPartitionLockKey
- org.apache.ignite.cache.CacheExistsException
org.apache.ignite.internal.processors.cache.IgniteCacheProxy
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$1
org.apache.ignite.internal.processors.cache.IgniteCacheProxy$2
