Merge remote-tracking branch 'remotes/origin/master' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb0b20a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb0b20a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb0b20a0 Branch: refs/heads/ignite-54 Commit: fb0b20a0af910afbafb3baef16692b2c224f87e8 Parents: da0235b 725d79f Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 15 19:22:01 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 15 19:22:01 2015 +0300 ---------------------------------------------------------------------- .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++++++++++++-------- .../java/org/gridgain/grid/p2p/p2p.properties | 17 ------- 2 files changed, 32 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
