git.decadent.org.uk Git - dak.git/commit

]> git.decadent.org.uk Git - dak.git/commit

author	Mike O'Connor <stew@vireo.org>
	Sat, 21 Feb 2009 14:29:47 +0000 (09:29 -0500)
committer	Mike O'Connor <stew@vireo.org>
	Sat, 21 Feb 2009 14:29:47 +0000 (09:29 -0500)
commit	fdf3c42445b4f11f4cd71634dd2b57cb7d7a4f36
tree	5dac720312b022b5ee6329461c8616fa883ca025	tree \| snapshot
parent	d878ff767ef1d4579cdb5e0b9bc3890e27fffc18	commit \| diff
parent	b34e1454c174ccc89f552a0871fbf18e19a01264	commit \| diff

Merge branch 'master' into content_generation, make changes based on Joerg's review

Conflicts:

dak/dakdb/update4.py
dak/init_db.py
dak/process_accepted.py
dak/update_db.py
daklib/database.py

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

config/debian/dak.conf	diff1 \|	diff2 \|	blob \| history
dak/contents.py	diff1 \|	\|	blob \| history
dak/dak.py	diff1 \|	diff2 \|	blob \| history
dak/dakdb/update4.py	diff1 \|	diff2 \|	blob \| history
dak/init_db.py	diff1 \|	diff2 \|	blob \| history
dak/process_accepted.py	diff1 \|	diff2 \|	blob \| history
dak/process_unchecked.py	diff1 \|	diff2 \|	blob \| history
dak/rm.py	diff1 \|	diff2 \|	blob \| history
daklib/database.py	diff1 \|	diff2 \|	blob \| history
daklib/utils.py	diff1 \|	diff2 \|	blob \| history
templates/missing-contents	diff1 \|	\|	blob \| history

dak changes to support and test code signing

RSS Atom

config/debian/dak.conf	diff1 \|	diff2 \|	blob \| history
dak/contents.py	diff1 \|	\|	blob \| history
dak/dak.py	diff1 \|	diff2 \|	blob \| history
dak/dakdb/update4.py	diff1 \|	diff2 \|	blob \| history
dak/init_db.py	diff1 \|	diff2 \|	blob \| history
dak/process_accepted.py	diff1 \|	diff2 \|	blob \| history
dak/process_unchecked.py	diff1 \|	diff2 \|	blob \| history
dak/rm.py	diff1 \|	diff2 \|	blob \| history
daklib/database.py	diff1 \|	diff2 \|	blob \| history
daklib/utils.py	diff1 \|	diff2 \|	blob \| history
templates/missing-contents	diff1 \|	\|	blob \| history