You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/09/28 09:46:20 UTC
[29/50] [abbrv] git commit: updated refs/heads/4.9-bountycastle-daan
to b9ee34f
Added license headders
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8805f955
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8805f955
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8805f955
Branch: refs/heads/4.9-bountycastle-daan
Commit: 8805f955a33fcf5b71997fb534314c7608a3db4f
Parents: 5f44390
Author: Bharat Kumar <bh...@accelerite.com>
Authored: Mon Sep 12 15:34:07 2016 +0530
Committer: Bharat Kumar <bh...@accelerite.com>
Committed: Mon Sep 12 16:13:32 2016 +0530
----------------------------------------------------------------------
.../cloud/network/element/RedundantResource.java | 16 ++++++++++++++++
setup/db/db/schema-452to460.sql | 2 +-
setup/db/db/schema-4910to41000.sql | 2 ++
3 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8805f955/api/src/com/cloud/network/element/RedundantResource.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/RedundantResource.java b/api/src/com/cloud/network/element/RedundantResource.java
index 863c9cd..39b6b97 100644
--- a/api/src/com/cloud/network/element/RedundantResource.java
+++ b/api/src/com/cloud/network/element/RedundantResource.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
package com.cloud.network.element;
import com.cloud.network.Network;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8805f955/setup/db/db/schema-452to460.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-452to460.sql b/setup/db/db/schema-452to460.sql
index e05ad6d..3b380f3 100644
--- a/setup/db/db/schema-452to460.sql
+++ b/setup/db/db/schema-452to460.sql
@@ -420,5 +420,5 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'KVM', 'default', 'CentOS 7', 246, utc_timestamp(), 0);
UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit` = '32' WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM';
-ALTER TABLE `cloud`.`domain_router` ADD COLUMN update_state varchar(64) DEFAULT NULL;
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8805f955/setup/db/db/schema-4910to41000.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-4910to41000.sql b/setup/db/db/schema-4910to41000.sql
index f18dbf3..8ea67e1 100644
--- a/setup/db/db/schema-4910to41000.sql
+++ b/setup/db/db/schema-4910to41000.sql
@@ -18,3 +18,5 @@
--;
-- Schema upgrade from 4.9.1.0 to 4.10.0.0;
--;
+
+ALTER TABLE `cloud`.`domain_router` ADD COLUMN update_state varchar(64) DEFAULT NULL;
\ No newline at end of file