Browse files

Merge branch 'stable' of github.com:abiquo/abiquo into stable

  • Loading branch information...
2 parents 18f5e22 + 361c015 commit ac60e994cc9d29667d1b38233eb6d495bbc3a5ff @sergicastro sergicastro committed Apr 12, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 database/delta/2.0.0-HF1/kinton-delta-2_0_0-to-2_0_0-HF1.sql
  2. +1 −1 database/kinton-schema.sql
View
2 database/delta/2.0.0-HF1/kinton-delta-2_0_0-to-2_0_0-HF1.sql
@@ -298,7 +298,7 @@ CREATE TRIGGER kinton.delete_nodevirtualimage_update_stats AFTER DELETE ON kinto
-- INSERT INTO debug_msg (msg) VALUES (CONCAT('deleteNVI values', IFNULL(cpu,'NULL'), ' - ',IFNULL(ram,'NULL'), ' - ',IFNULL(hd,'NULL')));
--
IF type = 1 THEN
- IF state NOT IN ("NOT_ALLOCATED","UNKNOWN") THEN
+ IF previousState NOT IN ("NOT_ALLOCATED","UNKNOWN") THEN
UPDATE IGNORE cloud_usage_stats SET vMachinesTotal = vMachinesTotal-1
WHERE idDataCenter = idDataCenterObj;
UPDATE IGNORE vapp_enterprise_stats SET vmCreated = vmCreated-1
View
2 database/kinton-schema.sql
@@ -2839,7 +2839,7 @@ CREATE TRIGGER kinton.delete_nodevirtualimage_update_stats AFTER DELETE ON kinto
-- INSERT INTO debug_msg (msg) VALUES (CONCAT('deleteNVI values', IFNULL(cpu,'NULL'), ' - ',IFNULL(ram,'NULL'), ' - ',IFNULL(hd,'NULL')));
--
IF type = 1 THEN
- IF state NOT IN ("NOT_ALLOCATED","UNKNOWN") THEN
+ IF previousState NOT IN ("NOT_ALLOCATED","UNKNOWN") THEN
UPDATE IGNORE cloud_usage_stats SET vMachinesTotal = vMachinesTotal-1
WHERE idDataCenter = idDataCenterObj;
UPDATE IGNORE vapp_enterprise_stats SET vmCreated = vmCreated-1

0 comments on commit ac60e99

Please sign in to comment.