if db.properties.override missing, shouldn't panic

This commit is contained in:
Edison Su 2012-10-10 16:20:35 -07:00
parent 339aa41442
commit 06d516a80c
3 changed files with 3 additions and 0 deletions

1
.gitignore vendored
View File

@ -58,3 +58,4 @@ awsapi/modules/*
.project .project
.settings.xml .settings.xml
.settings/ .settings/
db.properties.override

View File

@ -56,6 +56,7 @@
<file>${project.parent.basedir}/utils/conf/db.properties</file> <file>${project.parent.basedir}/utils/conf/db.properties</file>
<file>${project.parent.basedir}/utils/conf/db.properties.override</file> <file>${project.parent.basedir}/utils/conf/db.properties.override</file>
</files> </files>
<quiet>true</quiet>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -24,6 +24,7 @@ cluster.servlet.port=9090
# CloudStack database settings # CloudStack database settings
db.cloud.username=cloud db.cloud.username=cloud
db.cloud.password=cloud db.cloud.password=cloud
db.root.password=
db.cloud.host=localhost db.cloud.host=localhost
db.cloud.port=3306 db.cloud.port=3306
db.cloud.name=cloud db.cloud.name=cloud