Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d62b9059 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d62b9059 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d62b9059 Branch: refs/heads/ignite-1.5.1-2 Commit: d62b90591b6ae36b1394daf17a40084e8a292504 Parents: bbac649 23d7e25 Author: Anton Vinogradov <a...@apache.org> Authored: Mon Dec 28 15:20:38 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Dec 28 15:20:38 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 8 ++ 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/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 +++--- 15 files changed, 168 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d62b9059/modules/clients/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d62b9059/modules/scalar-2.10/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d62b9059/modules/scalar/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d62b9059/pom.xml ----------------------------------------------------------------------