You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/04/08 17:33:48 UTC
git commit: updated refs/heads/master to 04a7fed
Updated Branches:
refs/heads/master f09d981c3 -> 04a7fed35
CLOUDSTACK-1935: Rename tools from cloud-* to cloudstack-*
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04a7fed3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04a7fed3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04a7fed3
Branch: refs/heads/master
Commit: 04a7fed35f27c20bdd2b10ed30367d6cdb751779
Parents: f09d981
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Apr 8 17:09:54 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Apr 8 17:21:41 2013 +0200
----------------------------------------------------------------------
debian/cloudstack-agent.install | 6 +++---
debian/cloudstack-common.install | 8 ++++----
debian/cloudstack-management.install | 8 ++++----
debian/rules | 14 +++++++-------
4 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04a7fed3/debian/cloudstack-agent.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-agent.install b/debian/cloudstack-agent.install
index 0250185..a3cc869 100644
--- a/debian/cloudstack-agent.install
+++ b/debian/cloudstack-agent.install
@@ -5,9 +5,9 @@
# 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
@@ -20,7 +20,7 @@
/etc/cloudstack/agent/log4j-cloud.xml
/etc/init.d/cloudstack-agent
/usr/bin/cloudstack-setup-agent
-/usr/bin/cloud-ssh
+/usr/bin/cloudstack-ssh
/var/log/cloudstack/agent
/usr/share/cloudstack-agent/lib/*
/usr/share/cloudstack-agent/plugins
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04a7fed3/debian/cloudstack-common.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index 021474e..7e01ada 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -5,9 +5,9 @@
# 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
@@ -27,6 +27,6 @@
/usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
/usr/share/cloudstack-common/lib/*
-/usr/bin/cloud-set-guest-password
-/usr/bin/cloud-set-guest-sshkey
+/usr/bin/cloudstack-set-guest-password
+/usr/bin/cloudstack-set-guest-sshkey
/usr/lib/python2.?/*-packages/*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04a7fed3/debian/cloudstack-management.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index 6d87748..ed7744b 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -25,8 +25,8 @@
/var/log/cloudstack/management
/var/lib/cloudstack/mnt
/var/lib/cloudstack/management
-/usr/bin/cloud-update-xenserver-licenses
-/usr/bin/cloud-setup-management
-/usr/bin/cloud-setup-databases
-/usr/bin/cloud-migrate-databases
+/usr/bin/cloudstack-update-xenserver-licenses
+/usr/bin/cloudstack-setup-management
+/usr/bin/cloudstack-setup-databases
+/usr/bin/cloudstack-migrate-databases
/usr/share/cloudstack-management/*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04a7fed3/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index f05277e..c50214a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install:
install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
install -D agent/bindir/cloud-setup-agent.in $(DESTDIR)/usr/bin/cloudstack-setup-agent
- install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloud-ssh
+ install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloudstack-ssh
install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
# cloudstack-management
@@ -100,7 +100,7 @@ install:
ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
ln -s server-nonssl.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/server.xml
install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
- install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
+ install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses
ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
# This should all be in /etc/cloudstack/management
@@ -121,11 +121,11 @@ install:
cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
cp -r scripts/util $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
cp -r scripts/vm $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
- install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin
- install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin
- install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin
- install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin
- install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin
+ install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin/cloudstack-migrate-databases
+ install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin/cloudstack-set-guest-password
+ install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin/cloudstack-set-guest-sshkey
+ install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin/cloudstack-setup-databases
+ install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin/cloudstack-setup-management
install -D services/console-proxy/server/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place
install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib