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 Tue, 05 Apr 2016 13:38:19 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/8dda906e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8dda906e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8dda906e

Branch: refs/heads/3.0.x-fixes
Commit: 8dda906e3b62fc8e76f0a5e3115fb61490890ce1
Parents: 02c4c31
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Apr 5 14:07:17 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Apr 5 14:07:17 2016 +0100

----------------------------------------------------------------------
 .../cxf/systest/https/ciphersuites/CipherSuitesTest.java  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8dda906e/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index f253618..c86817d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -51,6 +51,7 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
     static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
     static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
     static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
+    static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
     
     private static final boolean UNRESTRICTED_POLICIES_INSTALLED;
     static {
@@ -73,15 +74,6 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
         UNRESTRICTED_POLICIES_INSTALLED = ok;
     }
     
-<<<<<<< HEAD
-=======
-    static final String PORT = allocatePort(CipherSuitesServer.class);
-    static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
-    static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
-    static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
-    static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
-    
->>>>>>> 3235f4b... Adding a TLS test for an expired cert
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue(


Mime
View raw message