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 3F561181EE for ; Fri, 12 Jun 2015 15:39:27 +0000 (UTC) Received: (qmail 71304 invoked by uid 500); 12 Jun 2015 15:39:27 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71273 invoked by uid 500); 12 Jun 2015 15:39:27 -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 71263 invoked by uid 99); 12 Jun 2015 15:39:27 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 15:39:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B6BEFC0C6F for ; Fri, 12 Jun 2015 15:39:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 4.517 X-Spam-Level: **** X-Spam-Status: No, score=4.517 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, TVD_SPACE_RATIO_MINFP=2.746, 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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id cejeOWczuoZU for ; Fri, 12 Jun 2015 15:39:21 +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 411D524B1A for ; Fri, 12 Jun 2015 15:39:20 +0000 (UTC) Received: (qmail 71244 invoked by uid 99); 12 Jun 2015 15:39:19 -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; Fri, 12 Jun 2015 15:39:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B3FBDFF09; Fri, 12 Jun 2015 15:39:19 +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: Fri, 12 Jun 2015 15:39:19 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123 Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10123 [created] b94ad86f5 Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98f01143 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98f01143 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98f01143 Branch: refs/heads/ignite-gg-10123 Commit: 98f0114397c96a35565cd48cdc61774e4df097e9 Parents: b76ed93 e188e18 Author: iveselovskiy Authored: Thu Jun 11 19:52:27 2015 +0300 Committer: iveselovskiy Committed: Thu Jun 11 19:52:27 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 8 ++++++++ .../org/apache/ignite/internal/IgniteKernal.java | 2 +- modules/mesos/README.txt | 2 +- .../org/apache/ignite/mesos/ClusterProperties.java | 15 +++++++++++++++ .../org/apache/ignite/mesos/IgniteScheduler.java | 10 +++++++--- 5 files changed, 32 insertions(+), 5 deletions(-) ----------------------------------------------------------------------