Merge branches 'ignite-3443' and 'master' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-3443


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

Branch: refs/heads/ignite-3443
Commit: b8b4e6a20c9c192c597f763d702e0fe750b2998d
Parents: 7c7c2a1 3d9f892
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Wed Oct 12 18:06:27 2016 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Wed Oct 12 18:06:27 2016 +0700

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteServices.java  | 48 +++++------
 .../ignite/internal/IgniteServicesImpl.java     |  4 +-
 .../ignite/internal/MarshallerContextImpl.java  |  7 +-
 .../GridCacheLazyPlainVersionedEntry.java       |  6 ++
 .../version/GridCachePlainVersionedEntry.java   |  5 +-
 .../org/apache/ignite/services/Service.java     | 12 +--
 .../marshaller/MarshallerContextSelfTest.java   | 90 ++++++++++++++++++++
 .../ignite/testsuites/IgniteBasicTestSuite.java |  2 +
 .../apache/ignite/sink/flink/IgniteSink.java    |  2 +-
 9 files changed, 139 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


Reply via email to