Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E2F9718890 for ; Mon, 7 Sep 2015 20:46:29 +0000 (UTC) Received: (qmail 15587 invoked by uid 500); 7 Sep 2015 20:46:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 15517 invoked by uid 500); 7 Sep 2015 20:46:29 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 14718 invoked by uid 99); 7 Sep 2015 20:46:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2015 20:46:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BAA6E04C9; Mon, 7 Sep 2015 20:46:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Mon, 07 Sep 2015 20:47:03 -0000 Message-Id: In-Reply-To: <9bce231ec239476dad68cda0dad0a0bc@git.apache.org> References: <9bce231ec239476dad68cda0dad0a0bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] ignite git commit: Merge branch ignite-1.3.2 into master. Merge branch ignite-1.3.2 into master. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f557728b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f557728b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f557728b Branch: refs/heads/ignite-788-dev Commit: f557728b3108ccd3b5f8ecd1190a8591de27bbca Parents: f0d24f6 6711d2c Author: Alexey Goncharuk Authored: Fri Jul 17 11:00:53 2015 -0700 Committer: Alexey Goncharuk 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/ignite/blob/f557728b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------