← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/api/ec2/admin.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/admin.py
168
168
 
169
169
    # FIXME(vish): these host commands don't work yet, perhaps some of the
170
170
    #              required data can be retrieved from service objects?
 
171
 
171
172
    def describe_hosts(self, _context, **_kwargs):
172
173
        """Returns status info for all nodes. Includes:
173
174
            * Disk Space