Kill py4j callback server properly

jacek-lewandowski · Sep 20, 2014 · 88f7506 · 88f7506
1 parent 54b5358
commit 88f7506
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py
@@ -17,8 +17,11 @@
 
 import sys
 from signal import signal, SIGTERM, SIGINT
+<<<<<<< HEAD
 
 import time
+=======
+>>>>>>> Kill py4j callback server properly
 
 from pyspark.conf import SparkConf
 from pyspark.files import SparkFiles