told git to track the right submodule branch

maxslimmer · Apr 26, 2015 · 6612fd1 · 6612fd1
1 parent 520950b
commit 6612fd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,5 @@
 [submodule "gluon/packages/dal"]
 	path = gluon/packages/dal
 	url = https://github.com/web2py/pydal.git
+[submodule "gluon.packages.dal"]
+	branch = 15.03-maintenance
diff --git a/gluon/packages/dal b/gluon/packages/dal
+0 −2		pydal/_globals.py
+4 −13		pydal/adapters/base.py
+2 −6		pydal/adapters/couchdb.py
+2 −5		pydal/adapters/google_adapters.py
+12 −34		pydal/base.py
+48 −22		pydal/helpers/classes.py
+50 −0		pydal/helpers/serializers.py
+20 −94		pydal/objects.py