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-1121 Commit: 595fe6edc1139ceb1061155c2dffacc963a30844 Parents: d815e51 f557728 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 20 10:41:12 2015 +0300 Committer: ivasilinets <ivasilin...@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(-) ----------------------------------------------------------------------
