Updated Branches: refs/heads/4.1 d20bcce7a -> 7802a62d5
CLOUDSTACK-1717, CLOUDSTACK-1718: Corrected RemoveRegion response. Removed /api in Local region end_point Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7802a62d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7802a62d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7802a62d Branch: refs/heads/4.1 Commit: 7802a62d5e563a02c4d58b5a188a5e5db270caa5 Parents: d20bcce Author: Kishan Kavala <[email protected]> Authored: Tue Mar 19 14:24:12 2013 +0530 Committer: Chip Childers <[email protected]> Committed: Tue Mar 19 13:12:29 2013 -0400 ---------------------------------------------------------------------- .../api/command/admin/region/RemoveRegionCmd.java | 2 +- setup/db/db/schema-40to410.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7802a62d/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java index 79c34d0..d2b696d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java @@ -33,7 +33,7 @@ import com.cloud.user.Account; @APICommand(name = "removeRegion", description="Removes specified region", responseObject=SuccessResponse.class) public class RemoveRegionCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RemoveRegionCmd.class.getName()); - private static final String s_name = "updateregionresponse"; + private static final String s_name = "removeregionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7802a62d/setup/db/db/schema-40to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index c8a7a61..b253663 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -261,7 +261,7 @@ CREATE TABLE `cloud`.`region` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -INSERT INTO `cloud`.`region` values ('1','Local','http://localhost:8080/client/api'); +INSERT INTO `cloud`.`region` values ('1','Local','http://localhost:8080/client'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.cpus', '40', 'The default maximum number of cpu cores that can be used for an account');
