deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								ae64a967f6
								
							
						 | 
						
							
							
								
								Continuing isolating ConflictLog detection issue
							
							
							
							
							
						 | 
						
							2018-10-08 22:40:41 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								51f6dcbd71
								
							
						 | 
						
							
							
								
								Trying to identify concurrency issue with ConflictDetection
							
							
							
							
							
						 | 
						
							2018-10-07 17:50:37 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								3d68a135a4
								
							
						 | 
						
							
							
								
								Conflict detection random bug isolation
							
							
							
							
							
						 | 
						
							2018-10-07 14:43:31 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								fa5cf2de57
								
							
						 | 
						
							
							
								
								Another set of conflictLog issue isolation
							
							
							
							
							
						 | 
						
							2018-10-07 12:25:53 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								58e5c654d3
								
							
						 | 
						
							
							
								
								Isolate conflict detect bug
							
							
							
							
							
						 | 
						
							2018-10-05 00:51:20 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								e411c81f3d
								
							
						 | 
						
							
							
								
								Removed double debug logs
							
							
							
							
							
						 | 
						
							2018-10-05 00:46:11 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								57647b8960
								
							
						 | 
						
							
							
								
								Isolate ConflictDetection function
							
							
							
							
							
						 | 
						
							2018-10-05 00:39:48 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								4bd4bbc247
								
							
						 | 
						
							
							
								
								Reverted travis debug lines
							
							
							
							
							
						 | 
						
							2018-10-02 23:26:04 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								a265ca4eef
								
							
						 | 
						
							
							
								
								Travis here and travis there
							
							
							
							
							
						 | 
						
							2018-10-02 22:38:57 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								74271d220c
								
							
						 | 
						
							
							
								
								I f*cking hate travis
							
							
							
							
							
						 | 
						
							2018-10-02 21:27:12 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								8a350333a8
								
							
						 | 
						
							
							
								
								Travis debug...
							
							
							
							
							
						 | 
						
							2018-10-02 19:32:21 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								d58071c898
								
							
						 | 
						
							
							
								
								Why is travis so bad...
							
							
							
							
							
						 | 
						
							2018-10-02 19:29:15 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								eb609f7faa
								
							
						 | 
						
							
							
								
								Some release details
							
							
							
							
							
						 | 
						
							2018-10-01 20:13:58 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								7e678b6480
								
							
						 | 
						
							
							
								
								Debug output for travis conflictDetect tests
							
							
							
							
							
						 | 
						
							2018-10-01 20:01:26 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								cf609998aa
								
							
						 | 
						
							
							
								
								Updated shunit test framework
							
							
							
							
							
						 | 
						
							2018-07-02 23:25:49 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								83321db4ea
								
							
						 | 
						
							
							
								
								WIP on conflict detection
							
							
							
							
							
						 | 
						
							2018-07-02 22:40:23 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								61f7ebe156
								
							
						 | 
						
							
							
								
								WIP: no conflictDetection tests while working on it
							
							
							
							
							
						 | 
						
							2018-07-02 15:44:27 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								41144f5705
								
							
						 | 
						
							
							
								
								Fixed fakeroot for ssh_filter
							
							
							
							
							
						 | 
						
							2018-07-02 15:41:30 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								5438941c88
								
							
						 | 
						
							
							
								
								Help..travis is killing me
							
							
							
							
							
						 | 
						
							2018-07-02 15:37:35 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								888309f420
								
							
						 | 
						
							
							
								
								Well... change FAKEROOT from /tmp to /home
							
							
							
							
							
						 | 
						
							2018-07-02 15:34:53 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								704d3d20a7
								
							
						 | 
						
							
							
								
								Travis... travis...travis...
							
							
							
							
							
						 | 
						
							2018-07-02 15:33:49 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								182e3921d5
								
							
						 | 
						
							
							
								
								Why do you do this travis ?
							
							
							
							
							
						 | 
						
							2018-07-02 15:23:44 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								e094e04038
								
							
						 | 
						
							
							
								
								Travis sudo to create a tmp file...
							
							
							
							
							
						 | 
						
							2018-07-02 15:15:39 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								a2a6d843b9
								
							
						 | 
						
							
							
								
								More travis tests
							
							
							
							
							
						 | 
						
							2018-07-02 15:12:02 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								7ddd13f122
								
							
						 | 
						
							
							
								
								Trying various travis fixes
							
							
							
							
							
						 | 
						
							2018-07-02 14:44:16 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								9e869e2bc4
								
							
						 | 
						
							
							
								
								Fix travis won't allow file creating in /tmp/osync_test_install
							
							
							
							
							
						 | 
						
							2018-07-02 10:12:16 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								c3b468d932
								
							
						 | 
						
							
							
								
								Travis related test
							
							
							
							
							
						 | 
						
							2018-07-02 10:00:38 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								0a8811cfb9
								
							
						 | 
						
							
							
								
								Temporarily disabled conflictList test
							
							
							
							
							
						 | 
						
							2018-07-01 10:55:07 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								21bc4e1ee7
								
							
						 | 
						
							
							
								
								WIP: conflict detection and fakeroot install
							
							
							
							
							
						 | 
						
							2018-06-30 19:46:11 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								1314a3381b
								
							
						 | 
						
							
							
								
								Updated osync test file URL
							
							
							
							
							
						 | 
						
							2018-05-18 12:29:39 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								29dc7a3e9e
								
							
						 | 
						
							
							
								
								Merge now requires program name
							
							
							
							
							
						 | 
						
							2017-06-19 16:01:47 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								3e9a380b6b
								
							
						 | 
						
							
							
								
								Updated config to v1.2.2-dev
							
							
							
							
							
						 | 
						
							2017-06-06 16:21:56 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								9cfd6c4eb4
								
							
						 | 
						
							
							
								
								Reenabled all tests
							
							
							
							
							
						 | 
						
							2017-04-08 22:10:01 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								eb5ca2c39d
								
							
						 | 
						
							
							
								
								Added default umask for test run
							
							
							
							
							
						 | 
						
							2017-04-08 22:05:22 +02:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								57facf189b
								
							
						 | 
						
							
							
								
								Removed silent option from install test
							
							
							
							
							
						 | 
						
							2017-02-08 15:03:18 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								024662f7ad
								
							
						 | 
						
							
							
								
								Fixed typo
							
							
							
							
							
						 | 
						
							2017-02-08 14:54:03 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								5ca7b7e6a2
								
							
						 | 
						
							
							
								
								Fix for installer error on msys/cygwin
							
							
							
							
							
						 | 
						
							2017-02-08 14:53:18 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								f0ed2098be
								
							
						 | 
						
							
							
								
								Fix installer on travis
							
							
							
							
							
						 | 
						
							2017-02-08 14:27:30 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								d320c84ce9
								
							
						 | 
						
							
							
								
								Fixed removing temp key from authorized_keys didn't work
							
							
							
							
							
						 | 
						
							2017-02-08 14:19:20 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								215e4f2108
								
							
						 | 
						
							
							
								
								Added install and uninstall to test system
							
							
							
							
							
						 | 
						
							2017-02-08 14:06:43 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								02b98249ad
								
							
						 | 
						
							
							
								
								Recoded ssh_filter to be easier and more secure
							
							
							
							
							
						 | 
						
							2017-02-08 13:53:42 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								70c858dc3d
								
							
						 | 
						
							
							
								
								Added ssh_filter to tests
							
							
							
							
							
						 | 
						
							2017-02-08 13:51:26 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								c7f676bd6e
								
							
						 | 
						
							
							
								
								Added _REMOTE_TOKEN to test list
							
							
							
							
							
						 | 
						
							2017-02-08 13:32:40 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								f5228fbbbf
								
							
						 | 
						
							
							
								
								Fixed variable name
							
							
							
							
							
						 | 
						
							2017-02-08 08:32:55 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								7aa1457971
								
							
						 | 
						
							
							
								
								Removed unnecessary comments
							
							
							
							
							
						 | 
						
							2017-02-08 08:30:15 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								48f9cfc973
								
							
						 | 
						
							
							
								
								Added mac commands
							
							
							
							
							
						 | 
						
							2017-02-07 22:51:26 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								a186964bc8
								
							
						 | 
						
							
							
								
								Moved some functions to ofunctions.sh
							
							
							
							
							
						 | 
						
							2017-02-07 22:05:27 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								b07df720d9
								
							
						 | 
						
							
							
								
								path fixes for rsync and bash
							
							
							
							
							
						 | 
						
							2017-02-07 21:28:50 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								84ee16cc12
								
							
						 | 
						
							
							
								
								Minor tweaks for cleanup
							
							
							
							
							
						 | 
						
							2017-02-07 21:21:41 +01:00 | 
						
					
				
					
						
							
							
								 
								deajan
							
						 | 
						
							
							
							
							
							
								
							
							
								33413fe80d
								
							
						 | 
						
							
							
								
								Another minor fix
							
							
							
							
							
						 | 
						
							2017-02-07 21:09:36 +01:00 |