Merge branches 'ignite-141' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.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/cc32cced
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc32cced
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc32cced
Branch: refs/heads/sprint-2
Commit: cc32cced9c30e18387c811e98e5f30210b0cae8c
Parents: 236f40f 9b0ba86
Author: Valentin Kulichenko <[email protected]>
Authored: Fri Mar 6 10:38:56 2015 -0800
Committer: Valentin Kulichenko <[email protected]>
Committed: Fri Mar 6 10:38:56 2015 -0800
----------------------------------------------------------------------
bin/igniterouter.sh | 7 +-
bin/setup-hadoop.sh | 7 +-
.../processors/cache/GridCacheProcessor.java | 10 ++-
.../processors/cache/GridCacheUtils.java | 2 +-
.../cache/GridCacheWriteBehindStore.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../ignite/internal/util/IgniteUtils.java | 67 ++++++++++++++++++--
...cheTransactionalAbstractMetricsSelfTest.java | 7 ++
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +--
.../distributed/GridCacheLockAbstractTest.java | 2 +
.../ignite/testframework/GridTestUtils.java | 2 +-
.../internal/processors/hadoop/HadoopSetup.java | 6 +-
12 files changed, 97 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc32cced/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc32cced/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc32cced/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
