Merge branch ignite-1.3.2 into master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f557728b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f557728b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f557728b Branch: refs/heads/ignite-884 Commit: f557728b3108ccd3b5f8ecd1190a8591de27bbca Parents: f0d24f6 6711d2c Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Jul 17 11:00:53 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Jul 17 11:00:53 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/plugin/security/SecurityPermission.java | 7 +++++-- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 8 +++----- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f557728b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------
