From 0b09cff8f186f6edc21d67e3c0887994ca3e0c45 Mon Sep 17 00:00:00 2001 From: giwa Date: Sun, 3 Aug 2014 22:05:28 -0700 Subject: [PATCH] added stop in StreamingContext --- python/pyspark/streaming/context.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py index a953fe382259c..1e284b58941c4 100644 --- a/python/pyspark/streaming/context.py +++ b/python/pyspark/streaming/context.py @@ -17,11 +17,7 @@ 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