Merge remote-tracking branch 'remotes/origin/sprint-2' into
ignite-release-test-no-mod
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/57cd4924
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57cd4924
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57cd4924
Branch: refs/heads/ignite-release-test-no-mod
Commit: 57cd4924168549a163e2f2944d1ce4594a111ca5
Parents: 033826b 5d460e0
Author: avinogradov <avinogra...@gridgain.com>
Authored: Wed Mar 11 18:03:02 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Wed Mar 11 18:03:02 2015 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 2 +-
.../ignite/internal/AsyncSupportAdapter.java | 15 ++-
.../processors/cache/CachePeekModes.java | 28 +++++
.../processors/cache/GridCacheAdapter.java | 25 ++++
.../cache/query/GridCacheQueryManager.java | 4 +-
.../processors/task/GridTaskProcessor.java | 31 ++---
.../core/src/main/resources/ignite.properties | 2 +-
.../internal/GridUpdateNotifierSelfTest.java | 16 +++
.../GridCommunicationSendMessageSelfTest.java | 2 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 2 +
.../GridCacheOnCopyFlagAtomicSelfTest.java | 3 +-
.../cache/GridCacheOnCopyFlagLocalSelfTest.java | 3 +-
.../GridCacheOnCopyFlagReplicatedSelfTest.java | 3 +-
...ridCacheOnCopyFlagTxPartitionedSelfTest.java | 3 +-
...IgniteCacheAtomicCopyOnReadDisabledTest.java | 32 +++++
...niteCacheCopyOnReadDisabledAbstractTest.java | 123 +++++++++++++++++++
.../IgniteCacheTxCopyOnReadDisabledTest.java | 32 +++++
.../testframework/junits/GridAbstractTest.java | 1 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 2 +-
20 files changed, 294 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
