cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Fri, 24 Mar 2017 12:29:10 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: e1c2ff8bf93c05263584f34cde83ad9599a94cb2
Parents: 0e95f2a
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Mar 24 12:29:00 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Mar 24 12:29:00 2017 +0000

----------------------------------------------------------------------
 .../cxf/systest/sts/issueunit/IssueUnitTest.java       | 13 -------------
 1 file changed, 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e1c2ff8b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 49963d6..7a6ff22 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -387,12 +387,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         
         bus.shutdown(true);
     }
-<<<<<<< HEAD
-    
-  //CHECKSTYLE:OFF
-=======
 
->>>>>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException
     @org.junit.Test
     public void testSAMLinWSSecToOtherRealm() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
@@ -480,12 +475,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
     ) throws Exception {
         return requestSecurityToken(tokenType, keyType, null, bus, endpointAddress, context,
null, null, null);
     }
-<<<<<<< HEAD
-    
-=======
 
     // CHECKSTYLE:OFF
->>>>>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException
     private SecurityToken requestSecurityToken(
         String tokenType, 
         String keyType,
@@ -542,12 +533,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         
         return stsClient.requestSecurityToken(endpointAddress);
     }
-<<<<<<< HEAD
-    
-=======
     // CHECKSTYLE:ON
 
->>>>>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException
     private Properties getEncryptionProperties() {
         Properties properties = new Properties();
         properties.put(


Mime
View raw message