You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/11 18:28:25 UTC
[1/2] incubator-geode git commit: GEODE-1380: mark
testRebalanceWithOfflineChildRegionTwoDiskStores as Flaky
Repository: incubator-geode
Updated Branches:
refs/heads/develop c92e5dad2 -> 3222b0514
GEODE-1380: mark testRebalanceWithOfflineChildRegionTwoDiskStores as Flaky
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/980b492d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/980b492d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/980b492d
Branch: refs/heads/develop
Commit: 980b492d113655ba21f5a33ec191f843adba18f9
Parents: c92e5da
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 11 11:22:45 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 11 11:22:45 2016 -0700
----------------------------------------------------------------------
.../PersistentColocatedPartitionedRegionDUnitTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/980b492d/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index b7919b1..6df3dec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -1354,7 +1354,8 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends PersistentPar
async1.getResult();
async2.getResult();
}
-
+
+ @Category(FlakyTest.class) // GEODE-1380: time sensitive, async actions with 30 sec max
public void testRebalanceWithOfflineChildRegionTwoDiskStores() throws Throwable {
SerializableRunnable createParentPR = new SerializableRunnable() {
public void run() {
[2/2] incubator-geode git commit: GEODE-1371: delete unused xml file
from java src set
Posted by kl...@apache.org.
GEODE-1371: delete unused xml file from java src set
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3222b051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3222b051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3222b051
Branch: refs/heads/develop
Commit: 3222b0514ba049ee2fdf52685e61a80a92b4eaa3
Parents: 980b492
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 11 11:23:27 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 11 11:23:27 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/test/golden/log4j2-test.xml | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3222b051/geode-core/src/test/java/com/gemstone/gemfire/test/golden/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/log4j2-test.xml b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/log4j2-test.xml
deleted file mode 100755
index 6a885ef..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/log4j2-test.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="ERROR" shutdownHook="disable" packages="com.gemstone.org.apache.logging.log4j.core.config.xml,com.gemstone.gemfire.internal.logging.log4j">
- <Properties>
- <Property name="gemfire-pattern">[%level{lowerCase=true} %date{yyyy/MM/dd HH:mm:ss.SSS z} <%thread> tid=%tid] %message%n%throwable%n</Property>
- </Properties>
- <Appenders>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="${gemfire-pattern}"/>
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="com.gemstone" level="WARN" additivity="true"/>
- <Logger name="quickstart" level="WARN" additivity="true"/>
- <Root level="ERROR">
- <AppenderRef ref="STDOUT"/>
- </Root>
- </Loggers>
-</Configuration>