You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/02/05 01:09:50 UTC
[3/7] ignite git commit: Merge remote-tracking branch
'apache/ignite-1.5' into ignite-2249
Merge remote-tracking branch 'apache/ignite-1.5' into ignite-2249
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b3aa12a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b3aa12a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b3aa12a
Branch: refs/heads/ignite-2249
Commit: 7b3aa12add9124809094bfe8729afae6b5083c45
Parents: 3f5a099 f1f8cda
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Mon Jan 4 16:22:22 2016 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Mon Jan 4 16:22:22 2016 -0800
----------------------------------------------------------------------
DEVNOTES.txt | 11 +++
RELEASE_NOTES.txt | 2 +
assembly/release-fabric-base.xml | 7 ++
assembly/release-sources.xml | 79 +++++++++++++++++++
modules/clients/pom.xml | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 7 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../ignite/internal/binary/BinaryContext.java | 44 +----------
.../internal/binary/BinaryEnumObjectImpl.java | 4 +-
.../internal/binary/BinaryObjectImpl.java | 27 ++++---
.../internal/binary/GridBinaryMarshaller.java | 82 +++++++++++++++++++-
.../processors/rest/GridRestProcessor.java | 4 +
.../rest/client/message/GridClientNodeBean.java | 4 +-
.../plugin/security/AuthenticationContext.java | 33 ++++++--
modules/platforms/cpp/DEVNOTES.txt | 59 ++++++++++++++
modules/platforms/cpp/README.txt | 64 ++++-----------
modules/platforms/cpp/project/vs/ignite.sln | 6 +-
modules/platforms/cpp/project/vs/ignite.slnrel | 10 +++
.../platforms/cpp/project/vs/ignite_x86.slnrel | 10 +++
modules/platforms/dotnet/Apache.Ignite.sln | 5 +-
modules/platforms/dotnet/DEVNOTES.txt | 18 +++++
.../rest/protocols/http/jetty/rest.html | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
parent/pom.xml | 4 +-
pom.xml | 23 +++---
26 files changed, 371 insertions(+), 143 deletions(-)
----------------------------------------------------------------------