# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1379247498 -7200
# Node ID cf213110054477b396f46a13a0c0cdd356033046
# Parent  278c45756ac92732ec87bb194bb37260e35709ff# Parent  446fbe6783a4b6afdf527ee2a6995cee9ad9d024
Merge with 446fbe6783a4b6afdf527ee2a6995cee9ad9d024

diff -r 278c45756ac9 -r cf2131100544 .hgtags
--- a/.hgtags	Sun Sep 15 14:17:45 2013 +0200
+++ b/.hgtags	Sun Sep 15 14:18:18 2013 +0200
@@ -34,3 +34,9 @@
 8d3948b137812ffd826fba490ba0c92f6d7a9ab3 V02.08.15
 989b403c7205e9531435b714ade4e5860d95806d V02.09
 ebe38cd5ad6395963d201fad75baec331262e6fa V02.09.01
+7da60a0dd2bb1aab23bbca0bc092d788856f1cb4 V02.10
+470cab46e94f0f3fc1f1f9bce5f5d52120e99250 V02.10.01
+af9825de6e04bc9c65c005d61ed55710ce5009fa V02.10.02
+2215a0411b25a9cbf3247731ed82aafc7242aa90 V02.10.03
+97d2a9ca495b1d3c061641f7e1f8cec2efe677a0 V02.10.04
+d33fd4d51ceae4183cdc1db70a1b624862bb4ebf V02.10.05
diff -r 278c45756ac9 -r cf2131100544 sbin/sync/config.py.tmpl
--- a/sbin/sync/config.py.tmpl	Sun Sep 15 14:17:45 2013 +0200
+++ b/sbin/sync/config.py.tmpl	Sun Sep 15 14:18:18 2013 +0200
@@ -10,7 +10,7 @@
     'ldt': {'repo':"/Users/ymh/dev/workspace/platform", 'src_root':'src/ldt'},
     'web': {'repo':"/Users/ymh/dev/workspace/platform_web", 'src_root':'src'},
     'hashcut': {'repo':"/Users/ymh/dev/workspace/hashcut", 'src_root':'src'},
-    'django-chunked-uploads' : {'repo':"/Users/ymh/dev/workspace/django-chunked-uploads", 'src_root':'', 'module': 'chunked-uploads'},
+    'metadatacomposer': {'repo':"/Users/ymh/dev/workspace/metadatacomposer", 'src_root':'src'},
 }
 env.base_export_path = "~/tmp"
 env.export_prefix = "platform"
diff -r 278c45756ac9 -r cf2131100544 src/ldtplatform/__init__.py
--- a/src/ldtplatform/__init__.py	Sun Sep 15 14:17:45 2013 +0200
+++ b/src/ldtplatform/__init__.py	Sun Sep 15 14:18:18 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (2, 9, 1, "final", 0)
+VERSION = (2, 10, 5, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 278c45756ac9 -r cf2131100544 src/ldtplatform/settings.py
--- a/src/ldtplatform/settings.py	Sun Sep 15 14:17:45 2013 +0200
+++ b/src/ldtplatform/settings.py	Sun Sep 15 14:18:18 2013 +0200
@@ -149,6 +149,7 @@
     'hashcut',
     'chunked_uploads',
     'ldtplatform',
+    'metadatacomposer',
 )
 
 #AUTH_PROFILE_MODULE = 'user.UserProfile'
diff -r 278c45756ac9 -r cf2131100544 src/ldtplatform/urls.py
--- a/src/ldtplatform/urls.py	Sun Sep 15 14:17:45 2013 +0200
+++ b/src/ldtplatform/urls.py	Sun Sep 15 14:18:18 2013 +0200
@@ -12,7 +12,7 @@
 # Uncomment the next two lines to enable the admin:
 admin.autodiscover()
 
-js_info_dict = {  
+js_info_dict = {
     'packages': ('django.contrib.admin',), 
 }
 
@@ -47,6 +47,7 @@
     
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
     (r'^hashcut/', include('hashcut.urls')),
+    (r'^composer/', include('metadatacomposer.urls')),
 )
 
 urlpatterns += staticfiles_urlpatterns()
diff -r 278c45756ac9 -r cf2131100544 src/requirement.txt
--- a/src/requirement.txt	Sun Sep 15 14:17:45 2013 +0200
+++ b/src/requirement.txt	Sun Sep 15 14:18:18 2013 +0200
@@ -1,2 +1,3 @@
-ldt (==1.49.2)
-hashcut (==0.10)
+ldt (==1.51.3)
+hashcut (==0.13)
+metadatacomposer (==0.1.17)
\ No newline at end of file