Merge with daeaf144418250308f31b45aa970f1b42cf7d4c7
authorymh <ymh.work@gmail.com>
Fri, 24 May 2013 23:27:51 +0200
changeset 105 665f520f23ae
parent 98 b94866be0f53 (diff)
parent 104 daeaf1444182 (current diff)
child 106 782776433a2d
Merge with daeaf144418250308f31b45aa970f1b42cf7d4c7
src/ldtplatform/config.py.tmpl
virtualenv/res/src/Django-1.4.5.tar.gz
virtualenv/res/src/MySQL-python-1.2.3.tar.gz
virtualenv/res/src/Pillow-1.7.8.tar.gz
virtualenv/res/src/distribute-0.6.31.tar.gz
virtualenv/res/src/django-extensions-1.0.2.tar.gz
virtualenv/res/src/django-oauth-plus-2.0.tar.gz
virtualenv/res/src/django-registration-0.8.tar.gz
virtualenv/res/src/django-tastypie-0.9.11-modified.tar.gz
virtualenv/res/src/fabric-1.5.1.tar.gz
virtualenv/res/src/httplib2-0.7.4.tar.gz
virtualenv/res/src/lxml-2.3.4.tar.bz2
virtualenv/res/src/mercurial-2.2.3.tar.gz
virtualenv/res/src/omab-django-social-auth-v0.3.10-modified.tar.gz
virtualenv/res/src/paramiko-1.9.0.tar.gz
virtualenv/res/src/psycopg2-2.4.6.tar.gz
virtualenv/res/src/pycrypto-2.6.tar.gz
virtualenv/res/src/pyelasticsearch-0.3.tar.gz
virtualenv/res/src/requests-1.1.0.tar.gz
virtualenv/res/src/simplejson-3.0.7.tar.gz
virtualenv/res/src/six-1.2.0.tar.gz
virtualenv/res/src/south-0.7.5.tar.gz
virtualenv/res/src/wsgiref-0.1.2.zip
virtualenv/res/src/zlib-1.2.7.tar.gz
virtualenv/sync/create_python_env.py
virtualenv/sync/env/.keepme
virtualenv/sync/res/res_create_env.py
virtualenv/sync/virtualenv.py
virtualenv/sync/virtualenv_support/__init__.py
virtualenv/sync/virtualenv_support/distribute-0.6.31.tar.gz
virtualenv/sync/virtualenv_support/pip-1.2.1.tar.gz
virtualenv/sync/virtualenv_support/setuptools-0.6c11-py2.5.egg
virtualenv/sync/virtualenv_support/setuptools-0.6c11-py2.6.egg
virtualenv/sync/virtualenv_support/setuptools-0.6c11-py2.7.egg
virtualenv/web/virtualenv_support/distribute-0.6.31.tar.gz
virtualenv/web/virtualenv_support/pip-1.2.1.tar.gz
--- a/.hgtags	Fri May 24 17:31:16 2013 +0200
+++ b/.hgtags	Fri May 24 23:27:51 2013 +0200
@@ -32,3 +32,5 @@
 d027f7adad037575e353d87f8946bd872e8e5054 V02.08.13
 ad105f4a95221d09bf58dbf62c31aaf3290d8e09 V02.08.14
 8d3948b137812ffd826fba490ba0c92f6d7a9ab3 V02.08.15
+989b403c7205e9531435b714ade4e5860d95806d V02.09
+ebe38cd5ad6395963d201fad75baec331262e6fa V02.09.01
--- a/sbin/sync/config.py.tmpl	Fri May 24 17:31:16 2013 +0200
+++ b/sbin/sync/config.py.tmpl	Fri May 24 23:27:51 2013 +0200
@@ -74,6 +74,7 @@
         'email_port' : 0,
         'forbidden_stream_url' : "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path=",
         'secret_key' : ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)]),         
+        'audio_record_url' : "rtmp://server.url/app_name",
     },
 }
 
--- a/src/ldtplatform/__init__.py	Fri May 24 17:31:16 2013 +0200
+++ b/src/ldtplatform/__init__.py	Fri May 24 23:27:51 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (2, 8, 15, "final", 0)
+VERSION = (2, 9, 1, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
--- a/src/ldtplatform/config.py.tmpl	Fri May 24 17:31:16 2013 +0200
+++ b/src/ldtplatform/config.py.tmpl	Fri May 24 23:27:51 2013 +0200
@@ -159,6 +159,8 @@
 
 FORBIDDEN_STREAM_URL = "%(forbidden_stream_url)s"
 
+AUDIO_RECORD_URL = "%(audio_record_url)s"
+
 FRONT_TAG_LIST = [u"Enmi 2011", u"film", u"conférence"]
 
 HAYSTACK_CONNECTIONS = {
--- a/src/requirement.txt	Fri May 24 17:31:16 2013 +0200
+++ b/src/requirement.txt	Fri May 24 23:27:51 2013 +0200
@@ -1,2 +1,2 @@
-ldt (==1.46.10)
+ldt (==1.49.2)
 hashcut (==0.10)