haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,427 Commits 140 Branches 416 Tags
bbe65f9dfb9b78cff1e6367894de7730bc139199
Commit Graph
11 Commits
Author SHA1 Message Date
Kenneth Skovhede 79f7b22e0f Merge branch 'master' into concurrent_processing 
Changed a few things on the way, removing the log process

# Conflicts:
#	Duplicati/Library/Main/Controller.cs
#	Duplicati/Library/Main/Database/ExtensionMethods.cs
#	Duplicati/Library/Main/Database/LocalBackupDatabase.cs
#	Duplicati/Library/Main/Duplicati.Library.Main.csproj
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	Duplicati/Library/Main/Operation/FilelistProcessor.cs
#	Duplicati/Library/Main/Operation/PurgeBrokenFilesHandler.cs
#	Duplicati/Library/Main/Operation/TestFilterHandler.cs
#	Duplicati/Library/Main/Options.cs
#	Duplicati/Library/Main/ResultClasses.cs
#	Duplicati/UnitTest/BasicSetupHelper.cs
 2018-04-11 23:02:47 +02:00
Kenneth Skovhede d18431b385 Merge branch 'master' into concurrent_processing 
# Conflicts:
#	Duplicati/Library/Main/Controller.cs
#	Duplicati/Library/Main/Database/ExtensionMethods.cs
#	Duplicati/Library/Main/Database/LocalBackupDatabase.cs
#	Duplicati/Library/Main/Duplicati.Library.Main.csproj
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	Duplicati/Library/Main/Operation/RecreateDatabaseHandler.cs
#	Duplicati/Library/Main/ResultClasses.cs

First attempt at merging all changes from 2016-10-08 to now :/
 2017-05-30 00:35:31 +02:00
Kenneth Skovhede c1c8c9a1aa Merge branch 'master' into concurrent_processing 
Some changes were required for this merge,
now the StreamBlockSplitter process will take in any stream, store the blocks and return the blockset ID.
This makes it compatible with the changes for metadata handling where they support more than a single block of metadata.

# Conflicts:
#	Duplicati/Library/Main/Database/LocalDatabase.cs
#	Duplicati/Library/Main/Database/LocalRepairDatabase.cs
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	Duplicati/Library/Main/Operation/RecreateDatabaseHandler.cs
 2016-10-18 13:27:36 +02:00
Kenneth Skovhede 46342075c1 Fixed error from last merge 2016-08-10 09:27:13 +02:00
Kenneth Skovhede f0c0fc3a2e Merge branch 'master' into concurrent_processing 
# Conflicts:
#	Duplicati/Library/Main/Database/LocalDatabase.cs
#	Duplicati/Library/Main/Duplicati.Library.Main.csproj
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	thirdparty/CoCoL/CoCoL.dll
 2016-08-08 15:03:42 +02:00
Kenneth Skovhede 537fe20838 Added a lot of comments. 
Fixed a few issues that caused parallel uploads.
Fixed the use of the encryption module so the encryption module is not re-used for multiple jobs.
 2016-02-25 19:15:51 +01:00
Kenneth Skovhede 20f7b42945 Fixed channels to use type-safe initializations. 
Updated logging channel to use a wrapper for later early-filter optimizations.
Various bug fixes and optimizations.
 2016-02-24 23:48:42 +01:00
Kenneth Skovhede 371965d88c Work towards using the processed based concurrent execution flow 2016-02-19 00:02:38 +01:00
Kenneth Skovhede ec877696b0 More work on concurrent processing 2016-02-18 16:46:53 +01:00
Kenneth Skovhede 01c3b3f5c0 More work on a concurrent implementation of the backup process 2016-02-09 09:17:31 +01:00
Kenneth Skovhede 0a26e263f1 Work on concurrent processing 2016-01-28 22:24:51 +01:00