Permalink
Browse files

Merge " Fixing bug 859937. Removing incorrect atom feed references fr…

…om roles.xsd."
  • Loading branch information...
Jenkins authored and openstack-gerrit committed Oct 13, 2011
2 parents 4b07efe + 8ff740d commit 3b08b94791a23fe1a2c000e738ab161868950c33
Showing with 1 addition and 6 deletions.
  1. +0 −4 keystone/content/common/xsd/roles.xsd
  2. +1 −1 keystone/controllers/roles.py
  3. +0 −1 keystone/utils.py
@@ -47,10 +47,6 @@
<!-- Complex Types -->
<complexType name="Role">
- <sequence>
- <element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
- </sequence>
<attribute name="id" type="xsd:string" use="optional"/>
<attribute name="name" type="xsd:string" use="required"/>
<attribute name="description" type="xsd:string" use="optional"/>
@@ -59,4 +59,4 @@ def delete_role_ref(self, req, user_id, role_ref_id):
def add_global_role_to_user(self, req, user_id, role_id):
config.SERVICE.add_global_role_to_user(utils.get_auth_token(req),
user_id, role_id)
- return utils.send_result(201)
+ return utils.send_result(201, None)
View
@@ -120,7 +120,6 @@ def send_result(code, req, result=None):
else:
content = result.to_json()
resp.headers['content-type'] = "application/json"
-
resp.content_type_params = {'charset': 'UTF-8'}
resp.unicode_body = content.decode('UTF-8')

0 comments on commit 3b08b94

Please sign in to comment.