Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc ... Conflicts: api/src/com/cloud/api/ApiConstants.java		2012-08-02 18:45:37 -07:00
..
DatabaseConfig.java	CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread	2012-08-02 21:50:44 +05:30
IPRangeConfig.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
PodZoneConfig.java	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00