err.no Git - dak/commit

]> err.no Git - dak/commit

author	Mike O'Connor <stew@vireo.org>
	Wed, 28 Jan 2009 02:09:57 +0000 (21:09 -0500)
committer	Mike O'Connor <stew@vireo.org>
	Wed, 28 Jan 2009 02:09:57 +0000 (21:09 -0500)
commit	f71ac27c75a8ab5185508491e97bc6f237772aa6
tree	c7d361756d737774514d0192f32ccf47cd6268d5	tree \| snapshot
parent	aa0907e8e139c58917b4343df6b0901289bfe027	commit \| diff
parent	2288ab34223700a1369905abe2c4c5593241c461	commit \| diff

Merge branch 'content_generation' of http://kernel.ubuntu.com/~mcasadevall/dak into content_generation

Conflicts:

dak/dakdb/update2.py
dak/update_db.py

This updates the "required_schema" to 4, moving mcasadevall's update2 to
update4

Signed-off-by: Mike O'Connor <stew@vireo.org>

dak/dakdb/update2.py	diff1 \|	diff2 \|	blob \| history
dak/dakdb/update4.py	\|	\|	blob
dak/update_db.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

dak/dakdb/update2.py	diff1 \|	diff2 \|	blob \| history
dak/dakdb/update4.py	\|	\|	blob
dak/update_db.py	diff1 \|	diff2 \|	blob \| history