Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cc2d36e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cc2d36e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cc2d36e Branch: refs/heads/ignite-639 Commit: 5cc2d36ebd4eb2a759220891ed8027d3641e2893 Parents: 9a523ce cef5227 Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Apr 3 19:23:34 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Apr 3 19:23:34 2015 +0300 ---------------------------------------------------------------------- .../ignite/events/CacheQueryExecutedEvent.java | 11 +++++------ .../apache/ignite/events/CacheQueryReadEvent.java | 11 +++++------ .../processors/cache/GridCacheMapEntry.java | 4 ++-- .../cache/query/GridCacheQueryManager.java | 18 +++++++++--------- .../continuous/CacheContinuousQueryHandler.java | 4 ++-- .../processors/query/GridQueryProcessor.java | 4 ++-- .../GridCacheContinuousQueryAbstractSelfTest.java | 4 ++-- .../query/h2/twostep/GridMapQueryExecutor.java | 4 ++-- .../cache/IgniteCacheAbstractQuerySelfTest.java | 8 ++++---- 9 files changed, 33 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
