Merge "Limit total number of active bookings per user"

author Parker Berberian <pberberian@iol.unh.edu>

Tue, 16 Apr 2019 16:53:08 +0000 (16:53 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 16 Apr 2019 16:53:08 +0000 (16:53 +0000)
author Parker Berberian <pberberian@iol.unh.edu>
Tue, 16 Apr 2019 16:53:08 +0000 (16:53 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 16 Apr 2019 16:53:08 +0000 (16:53 +0000)
diff --cc dashboard/src/booking/quick_deployer.py
Simple merge
diff --cc dashboard/src/workflow/models.py
Simple merge
author	Parker Berberian <pberberian@iol.unh.edu>
	Tue, 16 Apr 2019 16:53:08 +0000 (16:53 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 16 Apr 2019 16:53:08 +0000 (16:53 +0000)
		1	2
dashboard/src/booking/quick_deployer.py	patch \|	diff1 \|	diff2 \|	blob \| history
dashboard/src/workflow/models.py	patch \|	diff1 \|	diff2 \|	blob \| history