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/e161346c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e161346c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e161346c Branch: refs/heads/ignite-843 Commit: e161346cf467c92ec3f728a7739d944598b358ab Parents: 5104594 8ecddcc Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Aug 14 10:26:35 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Aug 14 10:26:35 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgnitionEx.java | 10 +++++----- .../continuous/GridContinuousProcessor.java | 16 +++++++++++----- .../GridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../continuous/GridEventConsumeSelfTest.java | 4 ++-- .../main/java/org/apache/ignite/IgniteSpring.java | 8 ++++---- 5 files changed, 23 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
