Madhuvishy has submitted this change and it was merged.
Change subject: Remove refernces to etcd, it is no longer used
......................................................................
Remove refernces to etcd, it is no longer used
Change-Id: Ic184593c3e81d44bc0324082e7f318b6b139c055
---
M bin/eventlogging-processor
M requirements.txt
M setup.py
3 files changed, 1 insertion(+), 9 deletions(-)
Approvals:
Madhuvishy: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/eventlogging-processor b/bin/eventlogging-processor
index af5eeaa..c5564ab 100755
--- a/bin/eventlogging-processor
+++ b/bin/eventlogging-processor
@@ -17,7 +17,6 @@
-h, --help show this help message and exit
--sid SID set input socket identity
--output-invalid URI of stream which to send invalid events
- --etcd-uri ETCD_URI
formatters:
%j JSON object
diff --git a/requirements.txt b/requirements.txt
index 81f0ef7..b057309 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@
mysqlclient>=1.3.7
pygments>=1.5
pykafka>=2.1.0
-python-etcd>=0.4.0
PyYAML>=3.10
pyzmq>=2.1
sqlalchemy>=0.7
diff --git a/setup.py b/setup.py
index 7ca76ac..5772c2d 100644
--- a/setup.py
+++ b/setup.py
@@ -67,17 +67,11 @@
# "mysqlclient>=1.3.7",
"pygments>=1.5",
"pykafka>=2.1.0",
- # python-etcd requires python-openssl >= 0.14, which is not
- # available in Trusty. Our python-etcd package does work with
- # python-openssl 0.13-2 which is available via .deb.
- # Commenting out this python dependency and allowing puppet
- # to satisify it until we upgrade eventlogging servers to Jessie.
- # "python-etcd>=0.4.0",
"PyYAML>=3.10",
"pyzmq>=2.1",
"sqlalchemy>=0.7",
"statsd>=3.0",
- # NOTE: This is commented out until we no longer run on Jessie
+ # NOTE: This is commented out until we no longer run on Trusty
# and we no longer use sudo python setup.py install to install.
# "tornado>=4.0",
# "sprockets.mixins.statsd>=1.3.1",
--
To view, visit https://gerrit.wikimedia.org/r/278303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic184593c3e81d44bc0324082e7f318b6b139c055
Gerrit-PatchSet: 1
Gerrit-Project: eventlogging
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
