Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 17185200B8C for ; Mon, 12 Sep 2016 13:46:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 15DE2160AB8; Mon, 12 Sep 2016 11:46:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 66E60160AD9 for ; Mon, 12 Sep 2016 13:46:15 +0200 (CEST) Received: (qmail 65909 invoked by uid 500); 12 Sep 2016 11:46:14 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 65762 invoked by uid 99); 12 Sep 2016 11:46:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2016 11:46:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0FA08E08BA; Mon, 12 Sep 2016 11:46:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Mon, 12 Sep 2016 11:46:17 -0000 Message-Id: <18e1bd0bfd4948bbb02d4ce32ba76363@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: updated refs/heads/master to 2acb0b7 archived-at: Mon, 12 Sep 2016 11:46:16 -0000 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/master Commit: 8805f955a33fcf5b71997fb534314c7608a3db4f Parents: 5f44390 Author: Bharat Kumar Authored: Mon Sep 12 15:34:07 2016 +0530 Committer: Bharat Kumar 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