Updated Branches: refs/heads/vpc 7044fa695 -> d33429783
Fixed deploydb Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d3342978 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d3342978 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d3342978 Branch: refs/heads/vpc Commit: d33429783f617702100490d9ae086ef3d2ca4de5 Parents: 7044fa6 Author: Alena Prokharchyk <[email protected]> Authored: Fri Jul 6 11:18:16 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Jul 6 11:18:16 2012 -0700 ---------------------------------------------------------------------- setup/db/create-schema.sql | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d3342978/setup/db/create-schema.sql ---------------------------------------------------------------------- diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 96dc7b9..72e40b3 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -2182,7 +2182,6 @@ CREATE TABLE `cloud`.`netscaler_pod_ref` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -<<<<<<< HEAD CREATE TABLE `cloud`.`vpc` ( `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', `uuid` varchar(40) NOT NULL,
