793 Commits

Author	SHA1	Message	Date
deajan	c78d6bc4ce	Fixed process counting message	2017-12-02 13:16:48 +01:00
deajan	7e26863daf	Backports from other projects	2017-12-02 12:45:00 +01:00
deajan	7d22be8375	Rebuilt targets	2017-11-23 16:58:49 +01:00
deajan	0a1dc91fad	Fixed bogus global WAIT_FOR variable	2017-11-23 16:58:29 +01:00
deajan	c05499c5f2	Improved ParallelExec status message	2017-11-23 00:38:12 +01:00
deajan	a65bec4410	Replaced IsNumeric with IsInteger for pid checks	2017-11-23 00:30:47 +01:00
deajan	a5618c80d8	Rebuilt targets	2017-11-22 15:05:26 +01:00
deajan	6d217c1e15	Reintroduced fix from #120	2017-11-22 15:05:09 +01:00
deajan	9833ce9032	Rebuilt targets	2017-11-22 15:02:36 +01:00
deajan	71a0437de6	Ensured writeLocks=false at beginning of lock handling	2017-11-22 15:02:17 +01:00
deajan	972b8481f1	Rebuilt targets	2017-08-14 22:22:28 +02:00
deajan	86930737b0	Added -f to local replica unlock	2017-08-14 22:21:41 +02:00
deajan	86ff4dc5e9	Rebuilt targets	2017-07-27 23:20:24 +02:00
deajan	168fc7b2f5	Updated usage	2017-07-27 23:16:51 +02:00
deajan	7cbbdb960a	Installer adds --prefix option + fixes	2017-07-27 23:15:35 +02:00
deajan	09c664fe4b	Moved commandline args setup to sub function	2017-07-27 22:50:48 +02:00
deajan	a80b65860a	Quick preflight check for bootstrap	2017-06-20 15:20:42 +02:00
deajan	1375ab425b	Initial upload of target helper service	2017-06-19 16:08:17 +02:00
deajan	29dc7a3e9e	Merge now requires program name	2017-06-19 16:01:47 +02:00
deajan	2038a2ecb9	Made bootstrap and merge program agnostic	2017-06-19 16:01:16 +02:00
deajan	e07cb136c4	Permit merge of other executables	2017-06-18 22:53:57 +02:00
deajan	5bcc7c75ea	Permit bootstrap of other executables	2017-06-18 22:48:38 +02:00
deajan	8d9a6be16a	Typo fixing	2017-06-18 22:11:09 +02:00
deajan	06becc5181	Updated ofunctions	2017-06-09 11:49:13 +02:00
deajan	1dc9408044	Fix double compression extension	2017-06-09 09:56:11 +02:00
deajan	9676ccccad	Removed work comments	2017-06-09 08:34:48 +02:00
deajan	45e4419a0f	Fixed typo	2017-06-09 08:33:57 +02:00
deajan	9b9631fe2c	Changed sed -E to sed -r for compat issues	2017-06-08 16:30:20 +02:00
deajan	5c36e803d8	Revert "More sort enforcing" ... This reverts commit fbb36b51b7.	2017-06-08 15:39:57 +02:00
deajan	fbb36b51b7	More sort enforcing	2017-06-08 15:20:36 +02:00
deajan	9220cecebc	Rebuilt targets	2017-06-08 14:43:17 +02:00
deajan	a7f9a28c93	Merge branch 'master' of https://github.com/deajan/osync	2017-06-08 14:42:12 +02:00
deajan	1f6fe47c2c	Rebuilt targets	2017-06-08 14:41:59 +02:00
deajan	4678ab7e71	Fixed missing env for LC_ALL	2017-06-08 09:25:33 +02:00
deajan	261521d047	Added LC_ALL to all ssh calls	2017-06-07 12:48:52 +02:00
deajan	10ebfaae16	Added LC_ALL=C to all ssh calls	2017-06-07 12:43:56 +02:00
deajan	30c6b3ec46	timestampList is not used for ACL lists yet	2017-06-07 12:17:39 +02:00
deajan	543cfc1159	Fixing sort order in conflictList	2017-06-06 17:39:53 +02:00
deajan	679e140084	Fix new regex in treelist for rsync output	2017-06-06 16:47:32 +02:00
deajan	3e9a380b6b	Updated config to v1.2.2-dev	2017-06-06 16:21:56 +02:00
deajan	84a108dd41	Rebuilt targets	2017-06-05 18:59:44 +02:00
deajan	d0d7be40c3	Added --dry support for conflict list	2017-06-05 18:59:05 +02:00
deajan	7a24cf49cd	Implemented --alert-conflicts options	2017-06-05 18:53:15 +02:00
deajan	be3b3d39b6	Added error handling to conflict list functions	2017-06-05 15:32:38 +02:00
deajan	11408d2de0	Add more locale exports	2017-06-05 15:03:01 +02:00
deajan	7260d43416	Improved conflict list work	2017-06-04 19:07:22 +02:00
deajan	1d7cb5be53	Multiple file list fixes	2017-06-04 13:01:34 +02:00
deajan	b4f1bd37ea	Rebuilt targets	2017-06-03 13:58:33 +02:00
deajan	2b786abc6a	Some comment removal	2017-06-03 13:57:10 +02:00
deajan	bd6b1a60e8	Rebuilt targets	2017-06-03 13:52:12 +02:00
deajan	967ce33977	WIP: conflict list	2017-06-03 13:51:49 +02:00
deajan	37ca73a6f9	moved unfortunate comment placement	2017-06-03 01:28:34 +02:00
deajan	9e1c3c2a65	WIP: conflict list	2017-06-03 01:20:38 +02:00
deajan	862a6fd235	Fixed some more typo	2017-06-02 15:42:45 +02:00
deajan	83fd33bf78	WIP: conflict list	2017-06-01 17:45:02 +02:00
deajan	99b606fef8	WIP: conflict list	2017-05-31 18:02:18 +02:00
deajan	b0307fd555	Another typo fix	2017-05-31 12:36:39 +02:00
deajan	eb73d49c69	Typo fixing	2017-05-31 12:31:18 +02:00
deajan	d91230e22f	WIP: conflict list	2017-05-31 11:16:36 +02:00
deajan	825e051e3b	WIP: conflict list	2017-05-30 15:45:43 +02:00
deajan	a7ceea1dac	WIP: conflict list	2017-05-30 15:00:05 +02:00
Orsiris de Jong	6a4b3701d0	Merge branch 'master' into no-resume	2017-05-30 14:50:21 +02:00
deajan	45cb042fa0	Added --no-resume option	2017-05-30 14:46:35 +02:00
deajan	5c60e7a9a2	WIP: conflict detection	2017-05-30 14:36:04 +02:00
deajan	a99a96e871	WIP: conflict detection	2017-05-30 14:35:44 +02:00
deajan	f98a9a0748	WIP: getting conflict list of files	2017-05-30 12:16:59 +02:00
deajan	b541a7c98e	WIP: detect conflict files	2017-05-30 11:14:11 +02:00
Orsiris de Jong	a32314c720	Merge branch 'master' into fix_options	2017-05-30 10:18:48 +02:00
deajan	520c20659f	Added missing options to subprocess in daemon mode	2017-05-30 10:12:28 +02:00
deajan	908c9af888	Added --log-conflicts option	2017-05-30 09:29:16 +02:00
deajan	0b442e2bcf	Updated work comments	2017-05-30 09:19:47 +02:00
deajan	a32b5f8321	Bumped version to next dev	2017-05-30 09:15:48 +02:00
deajan	2c1e688d8e	Bumped dev versions to rc	2017-05-30 09:11:00 +02:00
deajan	78dc39b86f	Change 23242 to	2017-05-30 09:09:25 +02:00
deajan	f8df6b8eab	Rebuilt targets	2017-05-29 16:54:02 +02:00
deajan	2b163d385b	KillChilds shoudln't allow a pid of 1 either	2017-05-29 16:53:43 +02:00
deajan	3174981b9a	Rebuilt targets	2017-05-29 15:14:00 +02:00
deajan	ab40ea64e2	Checking pid doesn't contain 0	2017-05-29 15:13:17 +02:00
deajan	ee8b213894	Rebuilt targets	2017-05-28 22:20:57 +02:00
deajan	11bd517982	Last fix for KillChilds pgrep issue on Mac	2017-05-28 22:20:41 +02:00
deajan	1400390f57	Rebuilt targets	2017-05-28 21:25:22 +02:00
deajan	c2b24688ef	Another fix in the wall	2017-05-28 21:25:03 +02:00
deajan	300108641a	Rebuilt targets	2017-05-28 20:17:57 +02:00
deajan	011a316f94	Added pid test in KillChilds	2017-05-28 20:17:38 +02:00
deajan	fe210877dc	Prevent possible recursive loop with bogus pgrep implementation	2017-05-28 13:37:12 +02:00
deajan	623408bf31	Rebuilt targets	2017-05-22 11:19:23 +02:00
deajan	5677335c24	Removed WIP dev sleep command in treeList	2017-05-22 11:19:03 +02:00
deajan	722e366ade	Rebuilt targets	2017-05-22 09:32:50 +02:00
deajan	762fd236a0	Bumped version to dev again	2017-05-22 09:32:34 +02:00
deajan	1a85d5ded9	Added -q parameter to ssh to inhibate banners	2017-05-22 09:32:12 +02:00
deajan	d1bb2fe68e	Rebuilt targets	2017-04-26 21:03:25 +02:00
deajan	402adba191	Fixed GetRemoteOS os-release getinfo	2017-04-26 21:03:04 +02:00
deajan	49bdd17202	Rebuilt targets	2017-04-26 13:56:11 +02:00
deajan	2934951495	Added wchan to performance profiler	2017-04-26 13:55:52 +02:00
deajan	ec857e8e01	Rebuilt targets	2017-04-26 13:51:58 +02:00
deajan	12685b3154	Added more params to performance profiler	2017-04-26 13:51:15 +02:00
deajan	e10a120e74	Rebuilt targets	2017-04-26 13:36:11 +02:00
deajan	128051cd8f	Added iostat to perf profiler	2017-04-26 13:35:54 +02:00
deajan	56b9efd686	Rebuilt targets	2017-04-26 12:04:21 +02:00
deajan	bbff9d55d6	Added perf profiler	2017-04-26 12:04:00 +02:00