From 353890aad1e29a746b132a7f05946eb7764460d5 Mon Sep 17 00:00:00 2001 From: Mike Cooper Date: Fri, 2 Nov 2012 10:54:48 -0700 Subject: [PATCH] [Bug 805015] Upgrade to Django 1.4. Also includes various library upgrades that were need for django 1.4 compatibility. --- .gitmodules | 6 ++++++ src/cef | 1 + src/commonware | 2 +- src/django | 2 +- src/django-adminplus | 1 + src/django-sha2 | 2 +- src/funfactory | 2 +- vendor.pth | 26 ++++++++++++++++++++++---- 8 files changed, 34 insertions(+), 8 deletions(-) create mode 160000 src/cef create mode 160000 src/django-adminplus diff --git a/.gitmodules b/.gitmodules index a53c615b..e76852ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,3 +76,9 @@ [submodule "src/pyelasticsearch"] path = src/pyelasticsearch url = git://github.com/toastdriven/pyelasticsearch.git +[submodule "src/cef"] + path = src/cef + url = git://github.com/mozilla/cef.git +[submodule "src/django-adminplus"] + path = src/django-adminplus + url = git://github.com/jsocol/django-adminplus.git diff --git a/src/cef b/src/cef new file mode 160000 index 00000000..39a9223f --- /dev/null +++ b/src/cef @@ -0,0 +1 @@ +Subproject commit 39a9223fba2b9a791f63a6e9e1cda745815eee1e diff --git a/src/commonware b/src/commonware index 27646eca..de48d09c 160000 --- a/src/commonware +++ b/src/commonware @@ -1 +1 @@ -Subproject commit 27646ecaca40a89024cc581c3ecf5eb0fa87ee11 +Subproject commit de48d09c4e3a27b2358c414c64067cd32f28e610 diff --git a/src/django b/src/django index e2ac9173..27332536 160000 --- a/src/django +++ b/src/django @@ -1 +1 @@ -Subproject commit e2ac91735f8acb9d1b792f510ed38e4afcb744b5 +Subproject commit 2733253633b8fa7663de2d95a356b92556cef551 diff --git a/src/django-adminplus b/src/django-adminplus new file mode 160000 index 00000000..09fa3872 --- /dev/null +++ b/src/django-adminplus @@ -0,0 +1 @@ +Subproject commit 09fa38724e8e05afc78f912da0ed78ef892da910 diff --git a/src/django-sha2 b/src/django-sha2 index aa87553f..3ba2b477 160000 --- a/src/django-sha2 +++ b/src/django-sha2 @@ -1 +1 @@ -Subproject commit aa87553fdb2dba3011207820cda61fa1e8652f07 +Subproject commit 3ba2b4771056fb722bc9fe52cf26918a3f0388bb diff --git a/src/funfactory b/src/funfactory index 3c9303ed..0fc3450a 160000 --- a/src/funfactory +++ b/src/funfactory @@ -1 +1 @@ -Subproject commit 3c9303ed7a278eee87c7b5fda9be46fcbea3732b +Subproject commit 0fc3450a152b3827d0064a6d53dea0a2ac56b883 diff --git a/vendor.pth b/vendor.pth index e810239f..befc9de2 100644 --- a/vendor.pth +++ b/vendor.pth @@ -1,10 +1,28 @@ -src/elasticutils +src/cef +src/commonware src/django -src/statsd -src/funfactory +src/django-adminplus +src/django-cache-machine +src/django-cronjobs +src/django-mobility +src/django-mozilla-product-details +src/django-multidb-router +src/django-nose src/django-session-csrf src/django-sha2 -src/django-mobility src/django-waffle +src/elasticutils +src/funfactory src/haystack +src/jingo +src/jingo-minify +src/nuggets src/pyelasticsearch +src/pyes +src/schematic +src/slugify +src/sphinxapi +src/statsd +src/test-utils +src/textcluster +src/tower