diff --git a/Authors b/Authors index 0de60275..e7a5bd8d 100644 --- a/Authors +++ b/Authors @@ -43,6 +43,7 @@ Eric Day Eric Windisch Ewan Mellor Gabe Westmaas +Hengqing Hu Hisaharu Ishii Hisaki Ohara Ilya Alekseyev diff --git a/doc/source/_static/jquery.tweet.js b/doc/source/_static/jquery.tweet.js index c93fea87..79bf0bdb 100644 --- a/doc/source/_static/jquery.tweet.js +++ b/doc/source/_static/jquery.tweet.js @@ -1,5 +1,5 @@ (function($) { - + $.fn.tweet = function(o){ var s = { username: ["seaofclouds"], // [string] required, unless you want to display our tweets. :) it can be an array, just do ["username1","username2","etc"] @@ -17,9 +17,9 @@ loading_text: null, // [string] optional loading text, displayed while tweets load query: null // [string] optional search query }; - + if(o) $.extend(s, o); - + $.fn.extend({ linkUrl: function() { var returning = []; diff --git a/doc/source/apidoc.rst b/doc/source/apidoc.rst index b0e70275..7d68394d 100644 --- a/doc/source/apidoc.rst +++ b/doc/source/apidoc.rst @@ -187,8 +187,8 @@ Normal Response code: 200 "type": "private", "updated_at": "2011-12-01T09:42:13" }, - ] - + ] + } @@ -1096,7 +1096,7 @@ None Normal Response code: 200 -Error - 404 Not Found [When interface is not found] +Error - 404 Not Found [When interface is not found] **JSON Response Example:** @@ -1149,7 +1149,7 @@ None Normal Response code: 200 -Error - 404 Not Found [When interface is not found] +Error - 404 Not Found [When interface is not found] Instance Interfaces =========================== @@ -1247,7 +1247,7 @@ Create a single interface for an instance and allocate an ip for the interface ====== ========================================================================================= ============================================================================================================== Verb URI Description ====== ========================================================================================= ============================================================================================================== - POST /ipam/instances/{instance_id}/interfaces Create an interface with the instance_id and allocate a mac. If a network is provided, allocate an ip as well. + POST /ipam/instances/{instance_id}/interfaces Create an interface with the instance_id and allocate a mac. If a network is provided, allocate an ip as well. ====== ========================================================================================= ============================================================================================================== **Params:** @@ -1548,7 +1548,7 @@ Deallocate all IpAddresses on an Interface ====== ======================================================================================== ========================================================= Verb URI Description ====== ======================================================================================== ========================================================= - DELETE /ipam/instance/{instance_id}/interfaces/{interface_id}/ip_addresses Delete all allocated IpAddresses on the interface + DELETE /ipam/instance/{instance_id}/interfaces/{interface_id}/ip_addresses Delete all allocated IpAddresses on the interface ====== ======================================================================================== ========================================================= **Params:** @@ -1906,17 +1906,17 @@ Normal Response code: 200 :: { - "policies": [ - { - "created_at": "2011-12-01T09:06:10", - "description": "policy_desc", - "id": "2f730874-2088-4f91-87fb-63792c753971", - "name": "rax_policy", - "tenant_id": "RAX", - "updated_at": "2011-12-01T09:06:10" - } - ] - } + "policies": [ + { + "created_at": "2011-12-01T09:06:10", + "description": "policy_desc", + "id": "2f730874-2088-4f91-87fb-63792c753971", + "name": "rax_policy", + "tenant_id": "RAX", + "updated_at": "2011-12-01T09:06:10" + } + ] + } Get details of a Tenant's IP Policy ----------------------------------- @@ -2178,7 +2178,7 @@ Create a unusable ip range in tenant's policy Normal Response code: 201 Error - 404 Not Found [When Policy doesn't exist] - + **JSON Response Example:** @@ -2225,7 +2225,7 @@ Update details of a policy's unusable ip range Normal Response code: 200 Error - 404 Not Found [When Policy or IP range doesn't exist] - + **JSON Response Example:** @@ -2261,7 +2261,7 @@ None Normal Response code: 200 Error - 404 Not Found [When Policy or IP range doesn't exist] - + Tenant Policy Unusable Ip Octets ================================ diff --git a/tools/rfc.sh b/tools/rfc.sh index 901fade1..ddcc22c5 100755 --- a/tools/rfc.sh +++ b/tools/rfc.sh @@ -1,5 +1,5 @@ #!/bin/sh -e -# Copyright (c) 2010-2011 Gluster, Inc. +# Copyright (c) 2010-2011 Gluster, Inc. # This initial version of this file was taken from the source tree # of GlusterFS. It was not directly attributed, but is assumed to be # Copyright (c) 2010-2011 Gluster, Inc and release GPLv3