Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Aurel
slapos
Commits
60f2a434
Commit
60f2a434
authored
Aug 29, 2018
by
Alain Takoudjou
Committed by
Guillaume Hervier
Aug 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "rdiff-backup: version up to 1.3.4nxd4"
This reverts commit
9b3dfa01
parent
1adedca8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
component/rdiff-backup/buildout.cfg
component/rdiff-backup/buildout.cfg
+1
-1
software/backupserver/software.cfg
software/backupserver/software.cfg
+2
-2
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+8
-6
No files found.
component/rdiff-backup/buildout.cfg
View file @
60f2a434
...
@@ -25,7 +25,7 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
...
@@ -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-1.3.4]
<= rdiff-backup-build
<= rdiff-backup-build
# use our own version
# use our own version
find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd
4
.tar.gz
find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd
2
.tar.gz
patches =
patches =
${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
...
...
software/backupserver/software.cfg
View file @
60f2a434
...
@@ -121,9 +121,9 @@ eggs =
...
@@ -121,9 +121,9 @@ eggs =
${rdiff-backup-build-1.3.4:egg}
${rdiff-backup-build-1.3.4:egg}
[versions]
[versions]
# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd
4
+SlapOSPatched001'
# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd
2
+SlapOSPatched001'
# but '1.3.4nxd2-SlapOSPatched001'.
# but '1.3.4nxd2-SlapOSPatched001'.
rdiff-backup = 1.3.4nxd
4
-SlapOSPatched001
rdiff-backup = 1.3.4nxd
2
-SlapOSPatched001
gunicorn = 19.1.1
gunicorn = 19.1.1
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
...
...
stack/resilient/buildout.cfg
View file @
60f2a434
...
@@ -125,11 +125,13 @@ mode = 0644
...
@@ -125,11 +125,13 @@ mode = 0644
# Time in minutes to wait for the backup to finish
# Time in minutes to wait for the backup to finish
backup_wait_time = 10
backup_wait_time = 10
[rdiff-backup]
[rdiff-backup-build]
eggs =
# use our own version
${rdiff-backup-build-1.3.4:egg}
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]
[versions]
# 1.3.4nxd
4
is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
# 1.3.4nxd
2
is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
# but '1.3.4nxd
4
-SlapOSPatched001'.
# but '1.3.4nxd
2
-SlapOSPatched001'.
rdiff-backup = 1.3.4nxd
4
-SlapOSPatched001
rdiff-backup = 1.3.4nxd
2
-SlapOSPatched001
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment