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

Conflicts:
	test/data/test.db
This commit is contained in:
Jake Moshenko 2015-02-13 13:17:10 -05:00
commit 5aedd1fabc
5 changed files with 53 additions and 13 deletions

View file

@ -5830,6 +5830,9 @@ quayApp.directive('buildMessage', function () {
case 'priming-cache':
return 'Priming cache for build';
case 'build-scheduled':
return 'Preparing build node';
case 'pushing':
return 'Pushing image built from Dockerfile';