shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hector Sanjuan 2012-03-16 03:31:20 +01:00
commit 9a49ca8356
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cloud/ec2/lib/econe-server.rb
View File

@ -33,9 +33,9 @@ end
EC2_AUTH = VAR_LOCATION + "/.one/ec2_auth"
EC2_LOG = LOG_LOCATION + "/econe-server.log"
CONFIGURATION_FILE = ETC_LOCATION + "/occi-server.conf"
CONFIGURATION_FILE = ETC_LOCATION + "/econe.conf"
TEMPLATE_LOCATION = ETC_LOCATION + "/occi_templates"
TEMPLATE_LOCATION = ETC_LOCATION + "/econe_templates"
VIEWS_LOCATION = RUBY_LIB_LOCATION + "/cloud/econe/views"
$: << RUBY_LIB_LOCATION