Merge remote-tracking branch 'remotes/origin/master' into ignite-3024
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d99f189f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d99f189f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d99f189f Branch: refs/heads/ignite-3024 Commit: d99f189fdbeb715c93282d33ee5abd7a6960c25e Parents: 5053376 ab1f194 Author: sboikov <[email protected]> Authored: Thu Apr 28 12:17:58 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 28 12:17:58 2016 +0300 ---------------------------------------------------------------------- .../internal/direct/DirectMessageReader.java | 5 +++ .../near/GridNearSingleGetRequest.java | 4 ++- .../cache/transactions/IgniteTxEntry.java | 4 +-- .../utils/PlatformConfigurationUtils.java | 2 ++ .../extensions/communication/MessageReader.java | 9 ++++++ .../IgniteConfigurationSerializerTest.cs | 3 +- .../IgniteConfigurationTest.cs | 2 ++ .../Apache.Ignite.Core/IgniteConfiguration.cs | 34 ++++++++++++++++++++ 8 files changed, 59 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
