curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dragonsi...@apache.org
Subject [1/2] curator git commit: fixed some merge issues
Date Mon, 17 Aug 2015 16:56:05 GMT
Repository: curator
Updated Branches:
  refs/heads/3.0-rejects [created] 397cdc044


fixed some merge issues


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/a200c5c0
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/a200c5c0
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/a200c5c0

Branch: refs/heads/3.0-rejects
Commit: a200c5c0122aa7dc783e9a1b34dd25c72b04c4a2
Parents: 8c8d7ec
Author: randgalt <randgalt@apache.org>
Authored: Tue May 12 17:11:34 2015 -0500
Committer: Scott Blum <dragonsinth@apache.org>
Committed: Wed Aug 12 17:30:27 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/curator/framework/imps/TestFrameworkEdges.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/a200c5c0/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
index cd3ae77..b25f46e 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
@@ -60,6 +60,7 @@ public class TestFrameworkEdges extends BaseClassForTests
     {
         for ( CreateMode mode : CreateMode.values() )
         {
+            System.out.println(mode);
             internalTestPathsFromProtectingInBackground(mode);
         }
     }


Mime
View raw message