| commit | 53c649644fa4216702ad88a3945b076f51738108 | |
| author | Chance Zibolski <chance.zibolski@gmail.com> | |
| Mon, 13 May 2013 21:41:37 +0000 (13 14:41 -0700) | ||
| committer | Chance Zibolski <chance.zibolski@gmail.com> | |
| Mon, 13 May 2013 21:41:37 +0000 (13 14:41 -0700) | ||
| tree | b637abfe4903cc709d80830bef395c5675406c76 | treesnapshot (tar.gz zip) |
| parent | 34d14401f7fa07d631db0961cc24dfb09f76b686 | commitdiff |
| parent | b53aaa76ff0a2109eac66a1a5c3579b7b7498d23 | commitdiff |
Merge branch 'bug/13443_vm_template_ballooning' into release/0.10
* bug/13443_vm_template_ballooning:
tests: Begin edit template tests
vm_wizard: fixed typo
template edit: has_balloonmem needed template.cluster, not just cluster
* bug/13443_vm_template_ballooning:
tests: Begin edit template tests
vm_wizard: fixed typo
template edit: has_balloonmem needed template.cluster, not just cluster