Merge remote-tracking branch 'upstream/gridgain-7.6.1' into gridgain-7.6.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f1747d7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f1747d7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f1747d7 Branch: refs/heads/master Commit: 2f1747d726da87b67f6c5323b3e64762d56398cb Parents: edc2947 9d937ca Author: vozerov-gridgain <[email protected]> Authored: Fri May 27 14:40:17 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri May 27 14:40:17 2016 +0300 ---------------------------------------------------------------------- .../internal/managers/GridManagerAdapter.java | 21 +++++++++++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 29 ++++++++++++++-- .../binary/BinaryMarshallerSelfTest.java | 15 ++++++++ .../CacheKeepBinaryWithInterceptorTest.java | 36 ++++++++++---------- .../ignite/internal/GridFactorySelfTest.java | 27 ++++++++++++++- 5 files changed, 105 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
