97cd0caa391d09fb785d27a9cc09c4547e15aa3c
				
			
			
		
	 Shawn O. Pearce
		
	
	97cd0caa39
	
	
	Support different project level merge policies
			Shawn O. Pearce
		
	
	97cd0caa39
	
	
	Support different project level merge policies
		
			
			Replace the hidden "gerrit.fastforwardonly" config file option with a project level property stored in the database containing one of three different values: * FAST_FORWARD_ONLY: Never create a merge commit * MERGE_IF_NECESSARY: Standard/default behavior * MERGE_ALWAYS: Always create a merge commit Signed-off-by: Shawn O. Pearce <sop@google.com>
Description
				RETIRED, Gerrit as used by OpenStack