Commit Graph

129 Commits

Author SHA1 Message Date
Josh Kearney 07113a8ff0 Incorprate johannes.erdfelt's patch 2011-04-06 13:27:43 -05:00
Chris Behrens b39a0eabd5 need to support python2.4, so can't use uuid module 2011-03-31 09:01:01 -07:00
Chris Behrens cf89dea62e localize NotImplementedError() 2011-03-30 13:38:10 -07:00
Chris Behrens 1e9cc02d3c Change '"%s" % e' to 'e'. 2011-03-30 13:36:03 -07:00
Chris Behrens a1992ba586 Add ed leafe's code for the inject_file agent plugin method that somehow got lost (fixes bug 741246).
Update TimeoutError string for i18n
2011-03-30 13:13:04 -07:00
matt.dietz@rackspace.com f806165703 Resolved conflicts 2011-03-22 17:02:33 +00:00
Josh Kearney 8437d947a6 Better errors when virt driver isn't loaded 2011-03-18 15:34:50 -05:00
Cerberus a8c2af6cda merge 2011-03-17 15:30:35 -05:00
Monsyne Dragon a766b4111a added in network qos support for xenserver.
Pull qos settings from flavor, use when creating instance.
2011-03-17 02:20:18 +00:00
Cerberus d1469d1566 Some typos 2011-03-16 11:26:40 -05:00
Cerberus 9650e73db3 Plugin 2011-03-15 19:10:50 -05:00
Eric Windisch ab982a009f fixes: 733137 2011-03-14 14:39:50 +00:00
Eric Windisch 65f6648f61 cast execute commands to str 2011-03-11 12:09:20 -05:00
Eric Windisch 2379fc056d execvp: fix params 2011-03-10 19:26:20 -05:00
Cory Wright 43b5d68b51 merge trunk 2011-03-10 13:59:43 +00:00
Eric Windisch e8554da80a execvp: cleanup. 2011-03-09 16:44:48 -05:00
Eric Windisch 0a52e9c99e Merge with main 2011-03-09 00:33:35 -05:00
Cory Wright 2554916265 merge trunk 2011-03-09 00:38:37 +00:00
Rick Harris dd2f001929 Use disk_format and container_format instead of image type 2011-03-08 22:14:25 +00:00
Eric Windisch 41f99fca5a Merge from main branch 2011-03-08 01:04:21 -05:00
Eric Windisch cac5881eaa execvp 2011-03-08 01:01:41 -05:00
Cory Wright 44a4d20d4b merged trunk 2011-03-04 17:59:28 +00:00
Cerberus 953fe68ce9 merge fixes 2011-03-02 15:46:50 -06:00
Cory Wright 6321c5047c * Added first cut of migration for os_type on instances table
* Track os_type when taking snapshots
2011-03-02 00:19:02 +00:00
Ken Pepple 2e12ee1c98 fixed pep8 2011-02-28 15:05:50 -08:00
Cerberus 8a9130eae5 Merge from trunk and mega conflict resolution 2011-02-28 15:42:54 -06:00
Cerberus 8da6796789 Merge review fixes 2011-02-28 12:30:02 -06:00
Cerberus ca1af3d0c1 Merge from trunk and merge conflict resolution 2011-02-28 11:39:23 -06:00
Rick Harris d27197ae53 Removing unecessary headers 2011-02-25 03:16:04 +00:00
Rick Harris e3d6dc70a6 Removing unecessary nokernel stuff 2011-02-25 02:51:14 +00:00
Rick Harris ec9ede003c Adding _make_subprocess function 2011-02-25 02:26:46 +00:00
Rick Harris 8cf6a0c01e No longer users image/ directory in tarball 2011-02-25 01:50:18 +00:00
Rick Harris c8345c9ebc Merging trunk, small fixes 2011-02-25 01:31:02 +00:00
Salvatore Orlando 7e463d2623 xenapi plugin function now checks whether /boot/guest already exists.
If not, it creates the directory
2011-02-24 11:43:40 +00:00
Rick Harris 05d135be0c Typo fix 2011-02-18 22:50:13 +00:00
Cerberus 201391007e Merge from trunk and merge conflict resolution 2011-02-18 16:45:31 -06:00
Rick Harris 36ccb108da Merging trunk 2011-02-18 17:33:18 +00:00
Ed Leafe c097223390 Uncommitted changes using the wrong author, and re-committing under the correct author 2011-02-17 22:09:26 +00:00
Cerberus 0c002f443d Merge from trunk 2011-02-17 14:23:28 -06:00
Trey Morris ea4d21b546 comments + Englilish, changed copyright in migration, removed network_get_all from db.api (vestigial) 2011-02-17 13:10:37 -06:00
Rick Harris 8dceaccb81 Typo fixes 2011-02-17 07:58:42 +00:00
Rick Harris 04e29f6dc4 Use glance image type to determine disk type 2011-02-17 01:24:31 +00:00
Rick Harris c56b1814cf Pep8 fixes 2011-02-16 23:39:12 +00:00
Cerberus d6c8fbe761 Merge from trunk 2011-02-16 13:49:54 -06:00
Rick Harris 585ba4d6cf Putting glance plugin under pep8 control 2011-02-16 18:43:55 +00:00
Cerberus bb98e20550 hurr durr 2011-02-15 23:10:29 -06:00
Rick Harris b89f3826a6 Merging trunk part 1 2011-02-16 02:44:37 +00:00
Cerberus cd5aba9d1d foo 2011-02-15 18:02:57 -06:00
Rick Harris af920572f4 Adding vhd hidden sanity check 2011-02-15 23:36:23 +00:00
Rick Harris c7cd7b755c More pep8 fixes 2011-02-15 22:31:51 +00:00