Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 1DDB918377 for ; Mon, 7 Dec 2015 17:12:47 +0000 (UTC) Received: (qmail 76993 invoked by uid 500); 7 Dec 2015 17:12:37 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 76962 invoked by uid 500); 7 Dec 2015 17:12:37 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 76953 invoked by uid 99); 7 Dec 2015 17:12:37 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 17:12:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 298E2180A96 for ; Mon, 7 Dec 2015 17:12:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.226 X-Spam-Level: X-Spam-Status: No, score=0.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id M0rHUE0aZgeg for ; Mon, 7 Dec 2015 17:12:30 +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 61FF024D8D for ; Mon, 7 Dec 2015 17:12:26 +0000 (UTC) Received: (qmail 61024 invoked by uid 99); 7 Dec 2015 17:05:45 -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 Dec 2015 17:05:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72FA5E0663; Mon, 7 Dec 2015 17:05:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jensdeppe@apache.org To: commits@geode.incubator.apache.org Date: Mon, 07 Dec 2015 17:06:31 -0000 Message-Id: In-Reply-To: <6eab8170c971407ea4704217184c5d00@git.apache.org> References: <6eab8170c971407ea4704217184c5d00@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-17 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/build.gradle ---------------------------------------------------------------------- diff --cc build.gradle index 44be620,b5465b8..395d543 --- a/build.gradle +++ b/build.gradle @@@ -372,11 -407,13 +407,11 @@@ subprojects } maxHeapSize '768m' - jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-XX:MaxPermSize=256M', '-ea'] + jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-ea'] - systemProperties = [ - 'gemfire.DEFAULT_MAX_OPLOG_SIZE' : '10', - 'gemfire.disallowMcastDefaults' : 'true', - 'jline.terminal' : 'jline.UnsupportedTerminal', - ] + systemProperty 'gemfire.DEFAULT_MAX_OPLOG_SIZE', '10' + systemProperty 'gemfire.disallowMcastDefaults', 'true' + systemProperty 'jline.terminal', 'jline.UnsupportedTerminal' def eol = System.getProperty('line.separator') def progress = new File(resultsDir, "$test.name-progress.txt") http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-assembly/build.gradle ---------------------------------------------------------------------- diff --cc gemfire-assembly/build.gradle index c4d9581,8de6d4e..84d9209 --- a/gemfire-assembly/build.gradle +++ b/gemfire-assembly/build.gradle @@@ -21,13 -21,13 +21,14 @@@ configurations dependencies { provided project(':gemfire-core') + archives project(':gemfire-common') archives project(':gemfire-json') archives project(':gemfire-joptsimple') - archives project(':gemfire-jgroups') archives project(':gemfire-core') + archives project(':gemfire-lucene') archives project(':gemfire-web') archives project(':gemfire-web-api') + archives project(':pulse') testCompile project(path: ':gemfire-junit', configuration: 'testOutput') testCompile project(path: ':gemfire-core', configuration: 'testOutput') @@@ -183,9 -191,12 +192,12 @@@ distributions } from project(":gemfire-core").configurations.archives.allArtifacts.files + from project(":gemfire-lucene").configurations.runtime + from project(":gemfire-lucene").configurations.archives.allArtifacts.files + // include this jar from project(":gemfire-web-api").jar.outputs.files.getFiles() - + // dependency jars from depsJar from gfshDepsJar http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/build.gradle ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bf38a03/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ----------------------------------------------------------------------