Merge branch 'master' into tutorial

Conflicts:
	static/directives/header-bar.html
This commit is contained in:
jakedt 2014-02-13 16:54:02 -05:00
commit 8135e0266e
4 changed files with 3 additions and 4 deletions

View file

@ -1234,7 +1234,7 @@ def request_repo_build(namespace, repository):
'build_uuid': build_request.uuid,
'namespace': namespace,
'repository': repository,
}))
}), retries_remaining=1)
log_action('build_dockerfile', namespace,
{'repo': repository, 'namespace': namespace,