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 604DA17C80 for ; Thu, 21 May 2015 13:14:08 +0000 (UTC) Received: (qmail 20664 invoked by uid 500); 21 May 2015 13:14:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 20631 invoked by uid 500); 21 May 2015 13:14:08 -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 20622 invoked by uid 99); 21 May 2015 13:14:08 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2015 13:14:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id DDBDAC73B2 for ; Thu, 21 May 2015 13:14:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-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-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 3DsAj_y_oTNn for ; Thu, 21 May 2015 13:14:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id AFD19262E0 for ; Thu, 21 May 2015 13:13:51 +0000 (UTC) Received: (qmail 16988 invoked by uid 99); 21 May 2015 13:13:51 -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; Thu, 21 May 2015 13:13:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88CA4E35CD; Thu, 21 May 2015 13:13:51 +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: Thu, 21 May 2015 13:14:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/34] 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: pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c60ed9b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c60ed9b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c60ed9b1 Branch: refs/heads/ignite-866 Commit: c60ed9b160adc5824dd72839fea24e523a71d512 Parents: c4d81fe cff73bf Author: avinogradov Authored: Wed May 20 19:22:46 2015 +0300 Committer: avinogradov Committed: Wed May 20 19:22:46 2015 +0300 ---------------------------------------------------------------------- modules/core/src/main/java/META-INF/LICENSE | 238 +++++++++++++++++++++++ modules/core/src/main/java/META-INF/NOTICE | 12 ++ parent/pom.xml | 1 - pom.xml | 37 +++- 4 files changed, 277 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c60ed9b1/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 0c6d0ba,26f5456..537b8f9 --- a/pom.xml +++ b/pom.xml @@@ -36,8 -36,10 +36,8 @@@ pom - scp://localhost:/home - ${project.artifactId}-${project.version} - ignite-${ignite.edition}-${project.version} + ${project.artifactId}-${ignite.edition}-${project.version}-bin