Martin Weinelt
								
							 
						 | 
						
							
							
								
							
							
	af3593590e
						 | 
						
							
							
								
								
								fix regression in last commit
							
							
							
							
							
							
						 | 
						
							2015-08-07 16:00:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Weinelt
								
							 
						 | 
						
							
							
								
							
							
	41c67d6c81
						 | 
						
							
							
								
								
								post-merge: hide stderr, when tinc cli is not found
							
							
							
							
							
							
						 | 
						
							2015-08-07 15:54:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Weinelt
								
							 
						 | 
						
							
							
								
							
							
	f46ef57b5e
						 | 
						
							
							
								
								
								post-merge: prefer the tinc1.1 cli over invoke-rc.d if it exists
							
							
							
							
							
							
						 | 
						
							2015-05-11 15:15:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Weinelt
								
							 
						 | 
						
							
							
								
							
							
	e3247d7cb5
						 | 
						
							
							
								
								
								Introduce the concept of metanodes
							
							
							
							
							
							
							
							
							updates the README file, and makes the post-merge script read the
metanodes file instead of the whole hosts/ directory. 
							
						 | 
						
							2015-04-18 16:34:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Weinelt
								
							 
						 | 
						
							
							
								
							
							
	0dc1fc7be3
						 | 
						
							
							
								
								
								post-merge: allow case-insensitive address parameter in host config
							
							
							
							
							
							
						 | 
						
							2015-04-13 02:35:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Ehlers
								
							 
						 | 
						
							
							
								
							
							
	c430991d41
						 | 
						
							
							
								
								
								post-merge: Use absolute path for invoke-rc.d.
							
							
							
							
							
							
							
							
							When the hook is triggered due to an cron job, the path may
not contain "/usr/sbin/" and thus the daemon reload is not happening. 
							
						 | 
						
							2015-02-18 10:14:38 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	881761be5b
						 | 
						
							
							
								
								
								scripts/post-merge: fix documentation
							
							
							
							
							
							
						 | 
						
							2014-12-28 20:45:52 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	b2f40d0a76
						 | 
						
							
							
								
								
								refactor post-merge hook
							
							
							
							
							
							
						 | 
						
							2014-09-04 13:29:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ralf Heiringhoff
								
							 
						 | 
						
							
							
								
							
							
	579794152f
						 | 
						
							
							
								
								
								rewrite post-merge to auto-generate tinc config
							
							
							
							
							
							
						 | 
						
							2014-09-03 15:06:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	1599a076f5
						 | 
						
							
							
								
								
								scripts: add post-merge sample hook for debian
							
							
							
							
							
							
						 | 
						
							2013-10-09 10:49:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |