Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7fc32b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7fc32b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7fc32b4 Branch: refs/heads/ignite-843 Commit: b7fc32b4ec3e1e56001e7369b30c644f9584d269 Parents: 4055e42 6697b0c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Aug 13 22:13:21 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Aug 13 22:13:21 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheGateway.java | 5 +- .../continuous/GridContinuousProcessor.java | 44 ++++-- .../ignite/internal/util/nio/GridNioServer.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 91 +++++++----- .../IgniteCacheContinuousQueryClientTest.java | 137 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 1 + scripts/git-format-patch.sh | 2 +- 7 files changed, 240 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
