From 558e3eb581d4af4ed13fae1b9635b75d86691640 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Thu, 15 Mar 2012 15:13:29 +0100
Subject: [PATCH 1/2] Fix econe configuration file_path (cherry picked from
 commit 6dc08dbfa6e86b10aea8e2a598bba4dda0d344d9)

---
 src/cloud/ec2/lib/econe-server.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb
index 0d20b59cc4..01c18da86c 100644
--- a/src/cloud/ec2/lib/econe-server.rb
+++ b/src/cloud/ec2/lib/econe-server.rb
@@ -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

From 9970bcc94c120aa971171a0adde16c89447ab4eb Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Thu, 15 Mar 2012 12:57:47 +0100
Subject: [PATCH 2/2] Bug #1168: Fix error reporting in Ozones client (cherry
 picked from commit fa61ff4e727913735179bd8345d504bf8c2439c2)

---
 src/ozones/Client/lib/zona.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ozones/Client/lib/zona.rb b/src/ozones/Client/lib/zona.rb
index d22a8270c4..7aae83c1ab 100644
--- a/src/ozones/Client/lib/zona.rb
+++ b/src/ozones/Client/lib/zona.rb
@@ -283,7 +283,7 @@ EOT
                         begin
                             str << "Body: " <<
                                 OZonesJSON.parse_json(value.body,
-                                                      "error")["message"]
+                                                      "error")[:message]
                         rescue
                             str.gsub!("\nBody:","")
                         end