Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9710fff6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9710fff6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9710fff6 Branch: refs/heads/ignite-59 Commit: 9710fff673887ce76936216db65fdd8efff21582 Parents: 224f7e2 fb0b20a Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 16 09:48:48 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 16 09:48:48 2015 +0300 ---------------------------------------------------------------------- .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++++++++++++-------- .../java/org/gridgain/grid/p2p/p2p.properties | 17 ------- 2 files changed, 32 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
