Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/903bbdd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/903bbdd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/903bbdd8 Branch: refs/heads/ignite-sprint-3 Commit: 903bbdd8837963de75ab71b2a70c4fccfca86a10 Parents: 520cc47 5b806d8 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Apr 6 10:28:27 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Apr 6 10:28:27 2015 +0700 ---------------------------------------------------------------------- .gitignore | 2 +- examples/schema-import/bin/db-init.sql | 17 ++ .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../streaming/numbers/StreamRandomNumbers.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../ignite/events/CacheQueryExecutedEvent.java | 11 +- .../ignite/events/CacheQueryReadEvent.java | 11 +- .../ignite/internal/GridCachePluginContext.java | 6 + .../internal/cluster/ClusterGroupAdapter.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 64 ++++--- .../cache/query/GridCacheQueryManager.java | 18 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../processors/plugin/CachePluginManager.java | 51 ++++-- .../processors/query/GridQueryProcessor.java | 4 +- .../ignite/plugin/CachePluginContext.java | 11 ++ .../ignite/plugin/CachePluginProvider.java | 4 +- .../org/apache/ignite/plugin/PluginContext.java | 9 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 + .../communication/tcp/TcpCommunicationSpi.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 - ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 + .../near/GridCacheNearReadersSelfTest.java | 2 +- ...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 | 94 ++++++++++ scripts/git-format-patch.sh | 87 ++++++++++ scripts/git-patch-functions.sh | 171 +++++++++++++++++++ scripts/git-patch-prop.sh | 24 +++ 32 files changed, 603 insertions(+), 92 deletions(-) ----------------------------------------------------------------------
