| 
						
					 | 
					
						
						
							
						
						5471d35524
					 | 
					
						
						
							
							Merge branch 'develop' into MAX-324
						
						
						
						
						
						
						
						Conflicts:
	server/include/modutil.h 
						
						
					 | 
					
						2015-03-09 10:18:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6766c0b883
					 | 
					
						
						
							
							Added statistics to backend references.
						
						
						
						
						
						
					 | 
					
						2015-03-06 17:41:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8cfd368e6b
					 | 
					
						
						
							
							Added more diagnostic output.
						
						
						
						
						
						
					 | 
					
						2015-03-06 17:06:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d98dd6e15f
					 | 
					
						
						
							
							Fixing errors caused by the merge with develop.
						
						
						
						
						
						
					 | 
					
						2015-03-05 11:14:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						561952e1ea
					 | 
					
						
						
							
							Moved service definition to router_options for shardrouter.
						
						
						
						
						
						
					 | 
					
						2015-02-26 20:34:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5477cdf5eb
					 | 
					
						
						
							
							Renamed the dbshard module to schemarouter.
						
						
						
						
						
						
					 | 
					
						2015-02-24 05:49:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |