Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fdf56a5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fdf56a5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fdf56a5d Branch: refs/heads/ignite-639 Commit: fdf56a5db66f4e7f24033f83f9d566a2eae177d2 Parents: 5dd8ff1 5b806d8 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Apr 6 09:57:55 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Apr 6 09:57:55 2015 +0700 ---------------------------------------------------------------------- examples/schema-import/bin/db-init.sql | 17 +++++++ .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 11 ++--- .../ignite/events/CacheQueryReadEvent.java | 11 ++--- .../internal/cluster/ClusterGroupAdapter.java | 3 +- .../cache/query/GridCacheQueryManager.java | 18 +++---- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../processors/query/GridQueryProcessor.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- .../ignite/messaging/GridMessagingSelfTest.java | 50 +++++++++++++++++++ .../query/h2/twostep/GridMapQueryExecutor.java | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 8 +-- parent/pom.xml | 1 - scripts/git-apply-patch.sh | 34 +++++++------ scripts/git-format-patch.sh | 35 ++++++++------ scripts/git-patch-functions.sh | 51 +++++++++++++++++--- scripts/git-patch-prop.sh | 10 ++-- 18 files changed, 189 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
