projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27639c4 e080072)
Merge branch 'stable-2.6' into devel-2.6
authorMichael Hanselmann <hansmi@google.com>
Thu, 8 Nov 2012 13:56:35 +0000 (14:56 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 8 Nov 2012 14:08:24 +0000 (15:08 +0100)
commit22105827ef1456eae18c8ab92b54c8b421247ab9
treed37907c9cf74081835b5190fc6160993f12552a9tree | snapshot
parent27639c4e7890e6d714286ded2a5efc3820be39c3commit | diff
parente080072c39135b360e216a4a2f617dc9f040830ccommit | diff
Merge branch 'stable-2.6' into devel-2.6

* stable-2.6:
  http/__init__.py: Remove extraneous argument
  rapi.testutils: Add utility to format HTTP headers
  rapi.testutils: Return headers from mock utility
  http: Add wrapper for mimetools.Message
  Add missing tests for commit f0d2286

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Unnamed repository; edit this file 'description' to name the repository.