Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd1babb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd1babb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd1babb6 Branch: refs/heads/ignite-gg-9615 Commit: cd1babb637d8f42f19812b8148e9039319cc3078 Parents: e2c0a06 f557728 Author: Pavel Tupitsyn <ptupit...@gridgain.com> Authored: Mon Jul 20 09:22:04 2015 +0300 Committer: Pavel Tupitsyn <ptupit...@gridgain.com> Committed: Mon Jul 20 09:22:04 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(-) ----------------------------------------------------------------------
