Merge branch 'ignite-2.1.2' of https://github.com/gridgain/apache-ignite into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3f6c1743 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f6c1743 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f6c1743 Branch: refs/heads/ignite-2.1 Commit: 3f6c1743b3ead0d861075f60d7d00ab238178333 Parents: c3401cb 6e371ec Author: Alexey Kukushkin <[email protected]> Authored: Thu Jul 6 12:44:47 2017 +0300 Committer: Alexey Kukushkin <[email protected]> Committed: Thu Jul 6 12:44:47 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 4 +++- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
