~ttx/nova/d4-merge

« back to all changes in this revision

Viewing changes to nova/tests/test_zones.py

  • Committer: Thierry Carrez
  • Date: 2011-08-23 12:23:07 UTC
  • mfrom: (1130.75.258 nova)
  • Revision ID: thierry@openstack.org-20110823122307-f0vtuyg1ikc14n87
Merge diablo-4 development from trunk (rev1479)

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
import datetime
20
20
import mox
21
 
import novaclient
22
21
 
23
22
from nova import context
24
23
from nova import db