You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gu...@apache.org on 2015/12/03 17:41:11 UTC

kafka git commit: Manually ported changes in 8c3c9548b636cdf760d2537afe115942d13bc003 to 0.9.0 (no cherry-pick due to conflicts)

Repository: kafka
Updated Branches:
  refs/heads/0.9.0 20e958861 -> ee8a7ce9a


Manually ported changes in 8c3c9548b636cdf760d2537afe115942d13bc003 to 0.9.0 (no cherry-pick due to conflicts)


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

Branch: refs/heads/0.9.0
Commit: ee8a7ce9a4789e4538cf9d337b2fc0d80204da06
Parents: 20e9588
Author: Geoff Anderson <ge...@confluent.io>
Authored: Wed Dec 2 15:42:57 2015 -0800
Committer: Geoff Anderson <ge...@confluent.io>
Committed: Wed Dec 2 15:42:57 2015 -0800

----------------------------------------------------------------------
 tests/kafkatest/services/security/minikdc.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/ee8a7ce9/tests/kafkatest/services/security/minikdc.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/services/security/minikdc.py b/tests/kafkatest/services/security/minikdc.py
index e1b4b95..cc660f2 100644
--- a/tests/kafkatest/services/security/minikdc.py
+++ b/tests/kafkatest/services/security/minikdc.py
@@ -17,6 +17,7 @@ from ducktape.services.service import Service
 from kafkatest.services.kafka.directory import kafka_dir
 
 import os
+import uuid
 
 
 class MiniKdc(Service):
@@ -32,8 +33,8 @@ class MiniKdc(Service):
     KEYTAB_FILE = "/mnt/minikdc/keytab"
     KRB5CONF_FILE = "/mnt/minikdc/krb5.conf"
     LOG_FILE = "/mnt/minikdc/minikdc.log"
-    LOCAL_KEYTAB_FILE = "/tmp/keytab"
-    LOCAL_KRB5CONF_FILE = "/tmp/krb5.conf"
+    LOCAL_KEYTAB_FILE = "/tmp/" + str(uuid.uuid4().get_hex()) + "_keytab"
+    LOCAL_KRB5CONF_FILE = "/tmp/" + str(uuid.uuid4().get_hex()) + "_krb5.conf"
 
     def __init__(self, context, kafka_nodes):
         super(MiniKdc, self).__init__(context, 1)