Merge remote-tracking branch 'origin/master' into rustedbuilds

Conflicts:
	test/data/test.db
This commit is contained in:
jakedt 2014-02-18 16:13:34 -05:00
commit ed38bcdafc
17 changed files with 1116 additions and 694 deletions

View file

@ -281,8 +281,8 @@ def populate_database():
token = model.create_access_token(building, 'write')
tag = 'ci.devtable.com:5000/%s/%s' % (building.namespace, building.name)
build = model.create_repository_build(building, token, '123-45-6789', tag,
'build-name')
build = model.create_repository_build(building, token, '701dcc3724fb4f2ea6c31400528343cd',
tag, 'build-name')
build.uuid = 'deadbeef-dead-beef-dead-beefdeadbeef'
build.save()