Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ae4faaf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ae4faaf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ae4faaf Branch: refs/heads/ignite-843-rc2 Commit: 8ae4faafdf57ecea0f210f6cd2a39809f399fb4d Parents: 0447430 f023c05 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Dec 28 20:19:58 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Dec 28 20:19:58 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 11 +++ assembly/release-sources.xml | 79 ++++++++++++++++++++ modules/clients/pom.xml | 2 +- .../apache/ignite/internal/IgniteKernal.java | 7 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../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 | 2 +- pom.xml | 23 +++--- 20 files changed, 267 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ae4faaf/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ae4faaf/pom.xml ----------------------------------------------------------------------
