Merge branches 'ignite-282' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-282
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a80d176d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a80d176d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a80d176d Branch: refs/heads/ignite-217 Commit: a80d176d41883f25fe387747e49785d4b3d7ef58 Parents: 5de17ee c5a15a1 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Feb 18 16:47:29 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Feb 18 16:47:29 2015 +0700 ---------------------------------------------------------------------- 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/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 ++++++++++++++++++ .../junits/common/GridCommonAbstractTest.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../commands/cache/VisorCacheCommand.scala | 3 - .../config/VisorConfigurationCommand.scala | 2 - .../commands/events/VisorEventsCommand.scala | 14 ++-- 19 files changed, 260 insertions(+), 181 deletions(-) ----------------------------------------------------------------------
