You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/09 03:41:08 UTC

[16/23] git commit: agent: Remove dummy.agent.properties

agent: Remove dummy.agent.properties

This configuration file isn't being used and would only confuse admins


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/27a43f9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/27a43f9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/27a43f9a

Branch: refs/heads/vpc
Commit: 27a43f9a9735ec46d94facb8020d19845d16c9b7
Parents: 5238a83
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Wed Aug 8 15:54:59 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Wed Aug 8 22:31:06 2012 +0200

----------------------------------------------------------------------
 agent/conf/dummy.agent.properties |   34 --------------------------------
 cloud.spec                        |    1 -
 2 files changed, 0 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/27a43f9a/agent/conf/dummy.agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/dummy.agent.properties b/agent/conf/dummy.agent.properties
deleted file mode 100644
index 5f8fefa..0000000
--- a/agent/conf/dummy.agent.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-resource=com.cloud.agent.resource.DummyResource
-host.mac.address=06\:95\:a4\:00\:03\:ee
-guest.network.device=cloudbr0
-type=Routing
-local.storage.uuid=8c348eee-ea56-4e4f-9397-00f33340927a
-port=8250
-host=10.216.132.110
-pod=1
-LibvirtComputingResource.id=1
-cluster=1
-public.network.device=cloudbr0
-private.network.device=cloudbr0
-DummyResource.id=11
-developer=True
-zone=1
-domr.scripts.dir=scripts/network/domr/kvm
-workers=5

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/27a43f9a/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index 28401a6..47a457a 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -556,7 +556,6 @@ fi
 %files agent
 %defattr(0644,root,root,0755)
 %config(noreplace) %{_sysconfdir}/%{name}/agent/agent.properties
-%config(noreplace) %{_sysconfdir}/%{name}/agent/dummy.agent.properties
 %config(noreplace) %{_sysconfdir}/%{name}/agent/developer.properties.template
 %config(noreplace)  %{_sysconfdir}/%{name}/agent/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/agent/log4j-%{name}.xml