Merge heads rpm-1.0-4
authorRyan Kelly <rfkelly@mozilla.com>
Fri, 21 Sep 2012 08:34:20 +1000
changeset 531 b9e168bd9333
parent 530 387622a5223a (current diff)
parent 529 13a9e639098a (diff)
child 532 146c1e238a70
push id115
push userrkelly@mozilla.com
push date2012-09-20 22:35 +0000
Merge heads
--- a/dev-reqs.txt
+++ b/dev-reqs.txt
@@ -11,8 +11,10 @@ simplejson
 Routes
 SQLAlchemy
 WSGIProxy
 recaptcha-client
 repoze.lru
 repoze.who
 zope.deprecation
 zope.interface
+metlog-py >= 0.9.6
+metlog-cef
--- a/prod-reqs.txt
+++ b/prod-reqs.txt
@@ -11,8 +11,10 @@ simplejson == 2.5.2
 Routes == 1.13
 SQLAlchemy == 0.6.6
 WSGIProxy == 0.2.2
 recaptcha-client == 1.0.6
 repoze.lru == 0.5
 repoze.who == 2.0
 zope.deprecation == 3.5.1
 zope.interface == 3.8
+metlog-py == 0.9.6
+metlog-cef == 0.1
--- a/stage-reqs.txt
+++ b/stage-reqs.txt
@@ -11,8 +11,10 @@ simplejson == 2.5.2
 Routes == 1.13
 SQLAlchemy == 0.6.6
 WSGIProxy == 0.2.2
 recaptcha-client == 1.0.6
 repoze.lru == 0.5
 repoze.who == 2.0
 zope.deprecation == 3.5.1
 zope.interface == 3.8
+metlog-py == 0.9.6
+metlog-cef == 0.1