Merge branches 'ignite-1.5' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b99f658 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b99f658 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b99f658 Branch: refs/heads/ignite-426-2 Commit: 8b99f658dcf8f37e0785621d7028ebeb1ebe3768 Parents: 242d988 7393227 Author: Andrey <anovi...@gridgain.com> Authored: Mon Nov 9 11:05:44 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Nov 9 11:05:44 2015 +0700 ---------------------------------------------------------------------- .../rest/AbstractRestProcessorSelfTest.java | 5 +- .../JettyRestProcessorAbstractSelfTest.java | 142 ++++++---- .../configuration/ConnectorConfiguration.java | 61 ++++- .../discovery/GridDiscoveryManager.java | 5 +- .../handlers/cache/GridCacheCommandHandler.java | 128 +++++++-- .../handlers/query/QueryCommandHandler.java | 258 +++++++++++++++---- .../top/GridTopologyCommandHandler.java | 4 - .../visor/commands/open/VisorOpenCommand.scala | 14 +- 8 files changed, 477 insertions(+), 140 deletions(-) ----------------------------------------------------------------------