tree 5c8e94f01cf2ea9e06b0b4d6711e5b982020b360
parent 653e8ec9b2b1c14d7beb2e3e183bb29c827fe9c4
parent 3e7426482cce37de7df8542c5430b6020d8ea8e7
author Jakub Pavlik <pavlk.jakub@gmail.com> 1495018909 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> 1495018909 +0000

Merge "Allow deploy nova.compute with nova.controller on same host."