Revert "rdiff-backup: version up to 1.3.4nxd4"

This reverts commit 9b3dfa01

component/rdiff-backup/buildout.cfg

@@ -25,7 +25,7 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
 [rdiff-backup-build-1.3.4]
 <= rdiff-backup-build
 # use our own version
-find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd4.tar.gz
+find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz
 patches =
   ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
 

software/backupserver/software.cfg

@@ -121,9 +121,9 @@ eggs =
   ${rdiff-backup-build-1.3.4:egg}
 
 [versions]
-# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd4+SlapOSPatched001'
+# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
 # but '1.3.4nxd2-SlapOSPatched001'.
-rdiff-backup = 1.3.4nxd4-SlapOSPatched001
+rdiff-backup = 1.3.4nxd2-SlapOSPatched001
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2

stack/resilient/buildout.cfg

@@ -125,11 +125,13 @@ mode = 0644
 # Time in minutes to wait for the backup to finish
 backup_wait_time = 10
 
-[rdiff-backup]
-eggs =
-  ${rdiff-backup-build-1.3.4:egg}
+[rdiff-backup-build]
+# use our own version
+find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd2.tar.gz
+patches =
+  ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
 
 [versions]
-# 1.3.4nxd4 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
-# but '1.3.4nxd4-SlapOSPatched001'.
-rdiff-backup = 1.3.4nxd4-SlapOSPatched001
+# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
+# but '1.3.4nxd2-SlapOSPatched001'.
+rdiff-backup = 1.3.4nxd2-SlapOSPatched001

[Kirill Smelkov]

@alain.takoudjou, in situations where we revert changes, it would be helpful, if the commit message contained the reason for the revert. /cc @rafael

[Alain Takoudjou]

@kirr, the merge request is here: !385 (merged)

There is some changes in this version done by Guillaume to speed up rdiff-backup. but it's not stable yet, it has memory leak and sometime it does not backup all files. Maybe Guillaume can give more information. The fix is not ready yet, we will version up again a soon as the fix is released.

[Rafael Monnerat]

@alain.takoudjou, .... what @kirr means is that it is helpfull to add the message on the revert commit and not somewhere else (in this case on the MR).

Even the message on the MR is not so clear, but this a whole new topic :)

[Kirill Smelkov]

@alain.takoudjou thanks for feedback. @rafael, yes, this is what I was talking about. Thank you both.

[Jérome Perrin]

When we use "Apply patches", there's no link from commit to the merge request. If the merge request description have more information than the commit messages, it's better to "merge as topic" to preserve the link I believe.