From 06d516a80ce6062bd04abbf5aac376020aec0309 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 10 Oct 2012 16:20:35 -0700 Subject: [PATCH] if db.properties.override missing, shouldn't panic --- .gitignore | 1 + developer/pom.xml | 1 + utils/conf/db.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3db1674f860..8a80bcc2560 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ awsapi/modules/* .project .settings.xml .settings/ +db.properties.override diff --git a/developer/pom.xml b/developer/pom.xml index 74edeaddd83..d2352c28aef 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -56,6 +56,7 @@ ${project.parent.basedir}/utils/conf/db.properties ${project.parent.basedir}/utils/conf/db.properties.override + true diff --git a/utils/conf/db.properties b/utils/conf/db.properties index 6bdb6d61667..8d981191b0e 100644 --- a/utils/conf/db.properties +++ b/utils/conf/db.properties @@ -24,6 +24,7 @@ cluster.servlet.port=9090 # CloudStack database settings db.cloud.username=cloud db.cloud.password=cloud +db.root.password= db.cloud.host=localhost db.cloud.port=3306 db.cloud.name=cloud