directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject directory-kerby git commit: Revert "Merge branch 'gssapi' of https://git-wip-us.apache.org/repos/asf/directory-kerby into gssapi"
Date Fri, 21 Jul 2017 11:30:39 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/gssapi 53aade434 -> 474f691b4


Revert "Merge branch 'gssapi' of https://git-wip-us.apache.org/repos/asf/directory-kerby into
gssapi"

This reverts commit 53aade43417b65958ae0393e3257803a49647a97, reversing
changes made to 8432c1a81c59e73829c350f328c7956a66d8a809.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/474f691b
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/474f691b
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/474f691b

Branch: refs/heads/gssapi
Commit: 474f691b451ca44937feb08d40319d7dc73e7df3
Parents: 53aade4
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jul 21 12:29:50 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jul 21 12:29:50 2017 +0100

----------------------------------------------------------------------
 kerby-kerb/integration-test/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/474f691b/kerby-kerb/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/pom.xml b/kerby-kerb/integration-test/pom.xml
index 6453b42..b091d30 100644
--- a/kerby-kerb/integration-test/pom.xml
+++ b/kerby-kerb/integration-test/pom.xml
@@ -50,26 +50,15 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-<<<<<<< HEAD
-=======
-      <groupId>org.apache.kerby</groupId>
-      <artifactId>kerb-gssapi</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
->>>>>>> f3876f97dfcba7cfe8b5eb793bfbec36669f93fc
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
-<<<<<<< HEAD
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-gssapi</artifactId>
       <version>${project.version}</version>
     </dependency>
-=======
->>>>>>> f3876f97dfcba7cfe8b5eb793bfbec36669f93fc
   </dependencies>
 </project>


Mime
View raw message