deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject git commit: CIMI: restore fix from DTACLOUD-509 (61c88b6211c5b03522fb05932ef08f7cbe340f09) seems to have been overwritten by stale branch/no rebase
Date Fri, 15 Mar 2013 08:27:34 GMT
Updated Branches:
  refs/heads/master 6779a572a -> 17069e69b


CIMI: restore fix from DTACLOUD-509 (61c88b6211c5b03522fb05932ef08f7cbe340f09)
seems to have been overwritten by stale branch/no rebase


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/17069e69
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/17069e69
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/17069e69

Branch: refs/heads/master
Commit: 17069e69b663f73f2083d0e8534b103ab2081c37
Parents: 6779a57
Author: marios <marios@redhat.com>
Authored: Fri Mar 15 10:25:31 2013 +0200
Committer: marios <marios@redhat.com>
Committed: Fri Mar 15 10:25:31 2013 +0200

----------------------------------------------------------------------
 server/lib/cimi/service/address_template.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/17069e69/server/lib/cimi/service/address_template.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/service/address_template.rb b/server/lib/cimi/service/address_template.rb
index 2a5a0d3..9532e09 100644
--- a/server/lib/cimi/service/address_template.rb
+++ b/server/lib/cimi/service/address_template.rb
@@ -23,8 +23,8 @@ class CIMI::Service::AddressTemplate < CIMI::Service::Base
         current_db.address_templates.map { |t| from_db(t, context) }
       end
     else
-      if context.driver.respond_to? :address_template
-        context.driver.address_template(context.credentials, :id => id, :env=>context)
+      if context.driver.respond_to? :address_templates
+        context.driver.address_templates(context.credentials, :id => id, :env=>context)
       else
         template = current_db.address_templates_dataset.first(:id => id)
         raise CIMI::Model::NotFound unless template


Mime
View raw message