Merge trunk.
This commit is contained in:
@@ -49,7 +49,8 @@ from nova import datastore
|
||||
from nova import flags
|
||||
from nova import twistd
|
||||
|
||||
from nova.tests.access_unittest import *
|
||||
#TODO(gundlach): rewrite and readd this after merge
|
||||
#from nova.tests.access_unittest import *
|
||||
from nova.tests.auth_unittest import *
|
||||
from nova.tests.api_unittest import *
|
||||
from nova.tests.cloud_unittest import *
|
||||
|
||||
Reference in New Issue
Block a user