Merge branches 'ignite-1' and 'ignite-59' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-59
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d787b5f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d787b5f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d787b5f9
Branch: refs/heads/ignite-59
Commit: d787b5f97feec9e368bcf1dc136d6ec0b3054c94
Parents: 9d4476d 9223d38
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Mon Jan 19 14:31:10 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Mon Jan 19 14:31:10 2015 +0300
----------------------------------------------------------------------
LICENSE.txt | 202 +++++++++++++++++++
apache-2.0.txt | 202 -------------------
.../ignite/portables/PortableRawReader.java | 2 +-
.../grid/dotnet/GridDotNetConfiguration.java | 14 +-
.../dotnet/GridDotNetPortableConfiguration.java | 28 +--
.../GridDotNetPortableTypeConfiguration.java | 15 +-
.../org/gridgain/grid/kernal/GridGainEx.java | 76 +++++--
.../grid/kernal/GridNodeAttributes.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 18 +-
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryImpl.java | 2 +-
.../GridCacheContinuousQueryAdapter.java | 13 +-
.../GridCacheContinuousQueryFilterEx.java | 32 +++
.../GridCacheContinuousQueryHandler.java | 17 +-
.../GridCacheContinuousQueryHandlerV3.java | 61 ++++++
.../GridCacheContinuousQueryHandlerV4.java | 61 ++++++
.../GridCacheContinuousQueryListener.java | 5 +
.../GridCacheContinuousQueryManager.java | 55 +++--
.../interop/GridInteropProcessorAdapter.java | 3 -
19 files changed, 522 insertions(+), 291 deletions(-)
----------------------------------------------------------------------
|