Merge branch 'uitest' of https://github.com/sornalingam/scrapy-cluster into uitest

Sornalingam · Sornalingam · commit 730737807e47 · 2018-04-18T17:37:30.000+05:30
# Conflicts:
#	docs/topics/changelog.rst
#	requirements.txt
diff --git a/docs/topics/changelog.rst b/docs/topics/changelog.rst
@@ -38,6 +38,11 @@ Utils
 - Adds quicker shutdown to ThreadedCounter object
 
 
+Admin UI
+^^^^^^^^
+
+- new component that allows for browser based interaction with the Scrapy Cluster
+
 Scrapy Cluster 1.2
 ------------------
 
diff --git a/requirements.txt b/requirements.txt
@@ -49,4 +49,6 @@ tldextract==2.1.0 # Updated from 2.0.2
 ujson==1.35
 w3lib==1.18.0 # Updated from 1.17.0
 zope.interface==4.4.2 # Updated from 4.3.3
-# Generated with piprot 0.9.7
+# Generated with piprot 0.9.7
+plotly==2.0.12
+flask_table==0.4.1
