Merge branch 'master' of https://lab.nexedi.com/nexedi/slapos

component/git/buildout.cfg

@@ -17,8 +17,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.9.2.tar.xz
-md5sum = dc5eb7ff2ca4641c6038f51ae49cad0f
+url = https://www.kernel.org/pub/software/scm/git/git-2.11.0.tar.xz
+md5sum = dd4e3360e28aec5bb902fb34dd7fce3b
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/rina-tools/buildout.cfg

@@ -10,7 +10,7 @@ parts = rina-tools
 [irati-stack]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/jmuchemb/irati-stack.git
-revision = af3cd8350ec43ab2d309c785daf0dd16d3835005
+revision = 2e1cdbcb497f9b088fa5a9ff9489df2f59d81d07
 git-executable = ${git:location}/bin/git
 
 [rina-tools]

slapos/recipe/pbs.py

@@ -65,6 +65,7 @@ def promise(args):
 
 class Recipe(GenericSlapRecipe, Notify, Callback):
   def _options(self, options):
+    options['rdiff-backup-data-folder'] = ""
     if 'slave-instance-list' in options:
       for slave in json.loads(options['slave-instance-list']):
         if slave['type'] == 'pull':