diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-21 16:18:49 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-21 16:18:49 -0400 |
| commit | 18388b26c0e28df103d07ad0cc28fd9bfaab6416 (patch) | |
| tree | 526b9004c1f6c7eeb82dcff2aa96a6b4f7596bac /nova/openstack | |
| parent | 6c037c5c639249556fcadd871d8af91760b50e90 (diff) | |
| parent | bec71bed9450d13202fdd7f54946e1376b271a2c (diff) | |
Merged trunk and fixed api servers conflict.
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions