Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Conflicts:
	initdb.py
This commit is contained in:
yackob03 2014-01-09 11:33:28 -05:00
commit 393343bda4
2 changed files with 6 additions and 4 deletions

View file

@ -286,6 +286,9 @@ def populate_database():
model.log_action('delete_tag', org.username, performer=new_user_2, repository=org_repo, timestamp=today,
metadata={'username': new_user_2.username, 'repo': 'orgrepo', 'tag': 'sometag'})
model.log_action('pull_repo', org.username, repository=org_repo, timestamp=today,
metadata={'token_code': 'somecode', 'repo': 'orgrepo'})
if __name__ == '__main__':
logging.basicConfig(**app.config['LOGGING_CONFIG'])
initialize_database()