Merge local changes
authorRyan Kelly <rfkelly@mozilla.com>
Mon, 14 Jan 2013 12:07:00 +1100
changeset 537 e72bcc4d1dce
parent 534 6d434f3750c0 (current diff)
parent 536 e9f881576053 (diff)
child 538 49c01f295908
push id118
push userrkelly@mozilla.com
push date2013-01-14 01:07 +0000
Merge local changes
--- a/.hgtags
+++ b/.hgtags
@@ -5,8 +5,9 @@ 6c10ac5811d9db60ceb46d8ec34449eb89efb980
 2d4eb4c5793aac69b73eb9cff71316c3cdf0d77d 1.3rc4
 773a11fc861c0056ef1df279c170701a6f660357 1.3rc5
 3032e32701c14092d0cee99d0e560ca15f76281e 1.3
 cf4f2faa698600dd63fc70fe436f452cad689844 1.3.1
 c9bad6fb1928b50371ddcd492ec405333642fa4c rpm-1.0-1
 85798b0a897ef1f64b9a387d3bb2db940abf367c rpm-1.0-2
 566d30fc4e1c3f118e5a56f00d7a32e0e15528bf rpm-1.0-3
 b9e168bd9333d19216f4e7d81ba642ac2ead82b2 rpm-1.0-4
+07616378d81aa5618fbad6385331ca03ca439b7e rpm-1.0-5
--- a/prod-reqs.txt
+++ b/prod-reqs.txt
@@ -1,20 +1,20 @@
-cef == 0.3
+cef == 0.5
 WebOb == 1.0.7
 Paste == 1.7.5.1
 PasteDeploy == 1.5
 PasteScript == 1.7.5
-Mako == 0.7
+Mako == 0.7.2
 MarkupSafe == 0.15
-Beaker == 1.6.3
+Beaker == 1.6.4
 python-memcached == 1.48
-simplejson == 2.5.2
+simplejson == 2.6.2
 Routes == 1.13
-SQLAlchemy == 0.6.6
+SQLAlchemy == 0.7.9
 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
@@ -1,20 +1,20 @@
-cef == 0.3
+cef == 0.5
 WebOb == 1.0.7
 Paste == 1.7.5.1
 PasteDeploy == 1.5
 PasteScript == 1.7.5
-Mako == 0.7
+Mako == 0.7.2
 MarkupSafe == 0.15
-Beaker == 1.6.3
+Beaker == 1.6.4
 python-memcached == 1.48
-simplejson == 2.5.2
+simplejson == 2.6.2
 Routes == 1.13
-SQLAlchemy == 0.6.6
+SQLAlchemy == 0.7.9
 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