You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2017/07/21 11:27:37 UTC
[50/50] [abbrv] directory-kerby git commit: Merge branch 'gssapi' of
https://git-wip-us.apache.org/repos/asf/directory-kerby into gssapi
Merge branch 'gssapi' of https://git-wip-us.apache.org/repos/asf/directory-kerby into gssapi
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/53aade43
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/53aade43
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/53aade43
Branch: refs/heads/gssapi
Commit: 53aade43417b65958ae0393e3257803a49647a97
Parents: 8432c1a f3876f9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jul 21 12:26:11 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jul 21 12:26:11 2017 +0100
----------------------------------------------------------------------
kerby-kerb/integration-test/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/53aade43/kerby-kerb/integration-test/pom.xml
----------------------------------------------------------------------
diff --cc kerby-kerb/integration-test/pom.xml
index b091d30,c41d6a0..6453b42
--- a/kerby-kerb/integration-test/pom.xml
+++ b/kerby-kerb/integration-test/pom.xml
@@@ -50,15 -50,15 +50,26 @@@
<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>