Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						a662851491
					 | 
					
						
						
							
							Initial fix of upstream merge.
						
						
						
						
						
						
					 | 
					
						2017-02-09 10:09:30 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						8af1edae0e
					 | 
					
						
						
							
							Hang detection additions.
						
						
						
						
						
						
					 | 
					
						2017-02-09 09:49:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						93cc12e3f2
					 | 
					
						
						
							
							Merge branch 'upstream'
						
						
						
						
						
						
					 | 
					
						2017-01-09 22:59:46 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						08a300d1a6
					 | 
					
						
						
							
							Merge in 2.0.2.
						
						
						
						
						
						
					 | 
					
						2017-01-09 22:58:21 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						e318e3171e
					 | 
					
						
						
							
							Revert "Merging in 1.0.2."
						
						
						
						
						
						
						
						This reverts commit 50cf3276e7. 
						
						
					 | 
					
						2017-01-09 22:52:13 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						50cf3276e7
					 | 
					
						
						
							
							Merging in 2.0.2.
						
						
						
						
						
						
					 | 
					
						2017-01-09 22:40:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Scott Haseley
							
						 
					 | 
					
						
						
							
						
						501773f90e
					 | 
					
						
						
							
							Added a global variable for the number of cpus
						
						
						
						
						
						
					 | 
					
						2016-03-25 11:11:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geoffrey Challen
							
						 
					 | 
					
						
						
							
						
						cafa9f5690
					 | 
					
						
						
							
							Initial Spring 2016 commit.
						
						
						
						
						
						
					 | 
					
						2015-12-23 00:50:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |