Revision 23057d29

b/lib/backend.py
1048 1048
        not accepted here, since that mode is handled differently, in
1049 1049
        cmdlib, and translates into full stop and start of the
1050 1050
        instance (instead of a call_instance_reboot RPC)
1051
  @type timeout: integer
1052
  @param timeout: maximum timeout for soft shutdown
1051
  @type shutdown_timeout: integer
1052
  @param shutdown_timeout: maximum timeout for soft shutdown
1053 1053
  @rtype: None
1054 1054

  
1055 1055
  """
b/lib/confd/querylib.py
143 143
class InstanceIpToNodePrimaryIpQuery(ConfdQuery):
144 144
  """A query for the location of one or more instance's ips.
145 145

  
146
  @type query: string or dict
147
  @param query: instance ip or dict containing:
148
                constants.CONFD_REQQ_LINK: nic link (optional)
149
                constants.CONFD_REQQ_IPLIST: list of ips
150
                constants.CONFD_REQQ_IP: single ip
151
                (one IP type request is mandatory)
152
  @rtype: (integer, ...)
153
  @return: ((status, answer) or (success, [(status, answer)...])
154

  
155 146
  """
156 147
  def Exec(self, query):
157 148
    """InstanceIpToNodePrimaryIpQuery main execution.
158 149

  
150
    @type query: string or dict
151
    @param query: instance ip or dict containing:
152
                  constants.CONFD_REQQ_LINK: nic link (optional)
153
                  constants.CONFD_REQQ_IPLIST: list of ips
154
                  constants.CONFD_REQQ_IP: single ip
155
                  (one IP type request is mandatory)
156
    @rtype: (integer, ...)
157
    @return: ((status, answer) or (success, [(status, answer)...])
158

  
159 159
    """
160 160
    if isinstance(query, dict):
161 161
      if constants.CONFD_REQQ_IP in query:
b/lib/http/auth.py
210 210
  def VerifyBasicAuthPassword(self, req, username, password, expected):
211 211
    """Checks the password for basic authentication.
212 212

  
213
    As long as they don't start with an opening brace ("{"), old passwords are
214
    supported. A new scheme uses H(A1) from RFC2617, where H is MD5 and A1
213
    As long as they don't start with an opening brace ("E{lb}"), old passwords
214
    are supported. A new scheme uses H(A1) from RFC2617, where H is MD5 and A1
215 215
    consists of the username, the authentication realm and the actual password.
216 216

  
217 217
    @type req: L{http.server._HttpServerRequest}

Also available in: Unified diff