Merge branch 'resiliency_annotated' into lapp
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 10:56:48 +0000 (11:56 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 20 Nov 2012 10:56:48 +0000 (11:56 +0100)
commit6675b2051c9fd13ebb16bdf0b38c1e34b6beac3a
tree5b4be5cea6544f5461c86cad827bca5a1ec47c74
parente8bd7a7d953082c7af64074bde668a098657bf48
parentc637561ada8b9fb67d1a5ec79b2ee9e71f01436d
Merge branch 'resiliency_annotated' into lapp

Conflicts:
slapos/recipe/request.py
slapos/recipe/request.py