You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/27 12:40:51 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1301' into ignite-1301
Merge remote-tracking branch 'remotes/origin/ignite-1301' into ignite-1301
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c5e833c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c5e833c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c5e833c
Branch: refs/heads/ignite-1301
Commit: 6c5e833cf08c58ce414a70f9e0db47fcffd2aa2a
Parents: 3d46b62 7a30405
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Aug 27 13:40:05 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Aug 27 13:40:05 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 4 ++
.../ignite/internal/IgniteNodeAttributes.java | 3 ++
.../discovery/GridDiscoveryManager.java | 13 ++++-
.../marshaller/portable/PortableMarshaller.java | 3 ++
.../GridDiscoveryManagerAttributesSelfTest.java | 50 ++++++++++++++++++++
5 files changed, 71 insertions(+), 2 deletions(-)
----------------------------------------------------------------------