Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-675


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dac23c45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dac23c45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dac23c45

Branch: refs/heads/ignite-639
Commit: dac23c45e1e317daee1ca6e31d60e3c742ad8c25
Parents: 3502ff0 580f051
Author: sboikov <semen.boi...@inria.fr>
Authored: Sun Apr 5 20:08:05 2015 +0300
Committer: sboikov <semen.boi...@inria.fr>
Committed: Sun Apr 5 20:08:05 2015 +0300

----------------------------------------------------------------------
 .gitignore                                      |   2 +-
 examples/schema-import/bin/db-init.sql          |  17 ++
 .../configuration/CacheConfiguration.java       |   2 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |  11 +-
 .../ignite/events/CacheQueryReadEvent.java      |  11 +-
 .../ignite/internal/GridCachePluginContext.java |   6 +
 .../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 +
 ...ridCacheContinuousQueryAbstractSelfTest.java |   4 +-
 .../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 +++
 27 files changed, 548 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


Reply via email to