Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg9499
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c35b1ff4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c35b1ff4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c35b1ff4 Branch: refs/heads/ignite-gg9499 Commit: c35b1ff45910e9e5016602f272894301661e873c Parents: 7298090 c0c28ab Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Jan 16 18:39:06 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Jan 16 18:39:06 2015 +0300 ---------------------------------------------------------------------- .../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 | 15 +++- .../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 - 17 files changed, 318 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
