You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 10:41:46 UTC

[06/10] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961

Merge remote-tracking branch 'remotes/origin/master' into ignite-961


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/595fe6ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/595fe6ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/595fe6ed

Branch: refs/heads/ignite-961
Commit: 595fe6edc1139ceb1061155c2dffacc963a30844
Parents: d815e51 f557728
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 10:41:12 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 10:41:12 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/plugin/security/SecurityPermission.java    | 7 +++++--
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 8 +++-----
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------