Merge branch 'sprint-2' into ignite-283
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/099ecbf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/099ecbf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/099ecbf9 Branch: refs/heads/ignite-283 Commit: 099ecbf97cf97ffbf27b202909afcc3adb481318 Parents: 3beb04b c5a15a1 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Feb 18 12:30:14 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Feb 18 12:30:14 2015 +0300 ---------------------------------------------------------------------- bin/include/target-classpath.bat | 4 +- bin/include/target-classpath.sh | 10 ++- .../IgniteAtomicSequenceExample.java | 35 ++++------ .../internal/client/impl/GridClientImpl.java | 2 +- .../processors/cache/GridCacheAdapter.java | 4 ++ .../processors/cache/IgniteCacheProxy.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../security/GridSecurityContext.java | 9 ++- .../cache/VisorCacheDefaultConfiguration.java | 57 --------------- .../visor/cache/VisorCacheLoadTask.java | 35 ++++------ .../visor/node/VisorNodeDataCollectorJob.java | 50 +++++++++++--- .../visor/node/VisorSpisConfiguration.java | 34 --------- .../internal/visor/util/VisorEventMapper.java | 73 ++++++++++++++++++++ .../internal/visor/util/VisorTaskUtils.java | 60 ++++++++-------- .../near/IgniteCacheNearReadCommittedTest.java | 68 ++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../commands/cache/VisorCacheCommand.scala | 3 - .../config/VisorConfigurationCommand.scala | 2 - .../commands/events/VisorEventsCommand.scala | 14 ++-- 21 files changed, 275 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/099ecbf9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
