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 E5D7B18328 for ; Tue, 12 May 2015 06:06:34 +0000 (UTC) Received: (qmail 31537 invoked by uid 500); 12 May 2015 06:06:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31507 invoked by uid 500); 12 May 2015 06:06:34 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 31498 invoked by uid 99); 12 May 2015 06:06:34 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 06:06:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 70FED1A29DD for ; Tue, 12 May 2015 06:06:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id g_z6rd-oqndm for ; Tue, 12 May 2015 06:06:26 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 3DA0125F18 for ; Tue, 12 May 2015 06:06:26 +0000 (UTC) Received: (qmail 30317 invoked by uid 99); 12 May 2015 06:06:25 -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; Tue, 12 May 2015 06:06:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4935BE179E; Tue, 12 May 2015 06:06:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 12 May 2015 06:06:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/22] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5 Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5 Conflicts: DEVNOTES.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c9cd92ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9cd92ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9cd92ef Branch: refs/heads/ignite-157 Commit: c9cd92ef29e2387e3290310a04809347808419d4 Parents: 2361640 ecc7a50 Author: avinogradov Authored: Fri May 8 17:50:26 2015 +0300 Committer: avinogradov Committed: Fri May 8 17:50:26 2015 +0300 ---------------------------------------------------------------------- parent/pom.xml | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------