You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by jm...@apache.org on 2015/08/26 21:36:55 UTC
incubator-atlas git commit: ATLAS-67 add zk service principal for
secure tests
Repository: incubator-atlas
Updated Branches:
refs/heads/master 113feb3af -> 2ed767c21
ATLAS-67 add zk service principal for secure tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/2ed767c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/2ed767c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/2ed767c2
Branch: refs/heads/master
Commit: 2ed767c21cde5de256b914655d16e2dd4b15ab6a
Parents: 113feb3
Author: Jon Maron <jm...@hortonworks.com>
Authored: Wed Aug 26 15:36:46 2015 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Wed Aug 26 15:36:46 2015 -0400
----------------------------------------------------------------------
pom.xml | 3 ++-
.../org/apache/atlas/web/security/BaseSSLAndKerberosTest.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/2ed767c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca1f988..a2b0b26 100755
--- a/pom.xml
+++ b/pom.xml
@@ -398,7 +398,7 @@
<properties>
<titan.storage.backend>hbase</titan.storage.backend>
<titan.index.backend>solr5</titan.index.backend>
- <solr.zk.address>localhost:2181</solr.zk.address>
+ <solr.zk.address>localhost:9983</solr.zk.address>
<titan.storage.hostname>localhost</titan.storage.hostname>
</properties>
</profile>
@@ -1454,6 +1454,7 @@
<argLine>-Djava.awt.headless=true -Dproject.version=${project.version}
-Dhadoop.tmp.dir=${project.build.directory}/tmp-hadoop-${user.name}
-Xmx1024m -XX:MaxPermSize=512m -Dlog4j.configuration=atlas-log4j.xml
+ -Djava.net.preferIPv4Stack=true
</argLine>
</configuration>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/2ed767c2/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java
index b5366ff..08f4b68 100644
--- a/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java
@@ -93,6 +93,7 @@ public class BaseSSLAndKerberosTest extends BaseSecurityTest {
File kdcWorkDir = startKDC();
userKeytabFile = createKeytab(kdc, kdcWorkDir, "dgi", "dgi.keytab");
+ createKeytab(kdc, kdcWorkDir, "zookeeper", "dgi.keytab");
httpKeytabFile = createKeytab(kdc, kdcWorkDir, "HTTP", "spnego.service.keytab");
// create a test user principal