~openstack-gd/nova/lp783478

Viewing all changes in revision 1076.

  • Committer: Eldar Nugaev
  • Date: 2011-05-20 09:29:54 UTC
  • mfrom: (1072.2.20 nova)
  • Revision ID: enugaev@griddynamics.com-20110520092954-1pp1aly9c2rtv5br
Merge and conflict resolving

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: