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 028601813A for ; Mon, 1 Jun 2015 14:18:00 +0000 (UTC) Received: (qmail 75891 invoked by uid 500); 1 Jun 2015 14:17:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 75845 invoked by uid 500); 1 Jun 2015 14:17:59 -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 75834 invoked by uid 99); 1 Jun 2015 14:17:59 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 14:17:59 +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 67661CA68D for ; Mon, 1 Jun 2015 14:17:59 +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-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id qk4nGf40ROdk for ; Mon, 1 Jun 2015 14:17:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 869A947C0F for ; Mon, 1 Jun 2015 14:17:48 +0000 (UTC) Received: (qmail 74795 invoked by uid 99); 1 Jun 2015 14:17:48 -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, 01 Jun 2015 14:17:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 031C0E04ED; Mon, 1 Jun 2015 14:17:47 +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: Mon, 01 Jun 2015 14:17:54 -0000 Message-Id: In-Reply-To: <3db3288ae5254bab891b7cae4ec7ec2f@git.apache.org> References: <3db3288ae5254bab891b7cae4ec7ec2f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-857' into ignite-857 Merge remote-tracking branch 'origin/ignite-857' into ignite-857 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62d15409 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62d15409 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62d15409 Branch: refs/heads/ignite-929 Commit: 62d15409cbe2af2f91092c9bd248cb1109218812 Parents: 1c04c8b a36214c Author: nikolay_tikhonov Authored: Thu May 28 17:48:06 2015 +0300 Committer: nikolay_tikhonov Committed: Thu May 28 17:48:06 2015 +0300 ---------------------------------------------------------------------- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 18 +- dev-tools/gradlew | 163 ++++++++---- dev-tools/slurp.sh | 2 +- dev-tools/src/main/groovy/jiraslurp.groovy | 73 ++++-- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../org/apache/ignite/services/Service.java | 5 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 20 +- .../service/ClosureServiceClientsNodesTest.java | 245 +++++++++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 4 + .../query/h2/sql/BaseH2CompareQueryTest.java | 16 ++ modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- .../apache/ignite/mesos/IgniteScheduler.java | 10 +- .../ignite/mesos/IgniteSchedulerSelfTest.java | 8 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../licenses/jcraft-revised-bsd.txt | 28 --- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 49 files changed, 508 insertions(+), 167 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62d15409/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java ---------------------------------------------------------------------- diff --cc modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java index bca064f,9507642..64e2931 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java @@@ -44,10 -44,10 +44,10 @@@ public class IgniteScheduler implement public static final String DELIM = ","; /** Logger. */ - private static final Logger log = LoggerFactory.getLogger(IgniteScheduler.class); + private static final Logger log = LogManager.getLogger(IgniteScheduler.class); /** Mutex. */ - private static final Object mux = new Object(); + private final Object mux = new Object(); /** ID generator. */ private AtomicInteger taskIdGenerator = new AtomicInteger();