Repository: cloudstack Updated Branches: refs/heads/master be8c6fe62 -> 455d2b328
CLOUDSTACK-6411: removing license header from nuget.config and agent settings file, with the header they are not getting loaded properly. Added an exception to not to do rat checks on these files. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/455d2b32 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/455d2b32 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/455d2b32 Branch: refs/heads/master Commit: 455d2b328433178cbeacf5ce5f8f600efb623868 Parents: 57f3e21 Author: Anshul Gangwar <[email protected]> Authored: Tue Apr 15 01:11:06 2014 -0700 Committer: Devdeep Singh <[email protected]> Committed: Mon Apr 21 14:10:17 2014 +0530 ---------------------------------------------------------------------- .../DotNet/ServerResource/.nuget/NuGet.Config | 11 +--------- .../AgentShell/AgentSettings.settings | 21 +------------------- pom.xml | 1 + 3 files changed, 3 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/455d2b32/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config index 5181cb8..3bdbf2e 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config @@ -1,13 +1,4 @@ -<!-- 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. --> -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <solution> <add key="disableSourceControlIntegration" value="true" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/455d2b32/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings index fb5b962..695ebe2 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings @@ -1,23 +1,4 @@ -<!-- - 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. ---> - -<?xml version='1.0' encoding='utf-8'?> +<?xml version='1.0' encoding='utf-8'?> <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings"; CurrentProfile="(Default)" GeneratedClassNamespace="CloudStack.Plugin.AgentShell" GeneratedClassName="AgentSettings"> <Profiles /> <Settings> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/455d2b32/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ed3eedb..a20c40c 100644 --- a/pom.xml +++ b/pom.xml @@ -747,6 +747,7 @@ <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config</exclude> <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config</exclude> <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj</exclude> + <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.settings</exclude> <exclude>plugins/hypervisors/hyperv/conf/agent.properties</exclude> <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude> <exclude>services/console-proxy/server/conf/agent.properties</exclude>
