| 
						
					 | 
					
						
						
							
						
						a562eb7cee
					 | 
					
						
						
							
							Merge branch 'develop' into MXS-179
						
						
						
						
						
						
						
						Conflicts:
	CMakeLists.txt 
						
						
					 | 
					
						2015-06-15 16:44:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f602121459
					 | 
					
						
						
							
							Added configurable SSL certificate verification depth and updated the documentation in the code.
						
						
						
						
						
						
					 | 
					
						2015-06-12 21:21:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03470bcd70
					 | 
					
						
						
							
							Merge branch 'develop' into MXS-129
						
						
						
						
						
						
					 | 
					
						2015-06-11 10:29:57 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f58f29494
					 | 
					
						
						
							
							Added a guide on how to have a HA setup of MaxScale with lsyncd.
						
						
						
						
						
						
					 | 
					
						2015-06-04 19:14:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e2611f241
					 | 
					
						
						
							
							Updated documentation with new configuration file name.
						
						
						
						
						
						
					 | 
					
						2015-06-03 11:07:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57060cafec
					 | 
					
						
						
							
							Added SSL level configuration to services.
						
						
						
						
						
						
					 | 
					
						2015-06-02 17:16:53 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5de4fc503
					 | 
					
						
						
							
							Merge branch 'develop' into MXS-129
						
						
						
						
						
						
					 | 
					
						2015-06-02 12:21:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2768955e7
					 | 
					
						
						
							
							SSL handshake now successfully completes when a client connects with SSL enabled.
						
						
						
						
						
						
					 | 
					
						2015-06-01 13:50:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3501ffb689
					 | 
					
						
						
							
							Updated documentation
						
						
						
						
						
						
					 | 
					
						2015-04-28 16:39:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						786f34cf49
					 | 
					
						
						
							
							Fixed typos in documentation.
						
						
						
						
						
						
					 | 
					
						2015-04-14 20:36:29 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cae00c4087
					 | 
					
						
						
							
							Change skysql to mariadb
						
						
						
						
						
						
					 | 
					
						2015-03-23 14:20:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7cfc1d3cc9
					 | 
					
						
						
							
							Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'.
						
						
						
						
						
						
					 | 
					
						2015-03-23 14:53:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9603682a5c
					 | 
					
						
						
							
							Some documentation cleanup
						
						
						
						
						
						
					 | 
					
						2015-02-13 19:55:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67a52f51e8
					 | 
					
						
						
							
							Updates to core pages
						
						
						
						
						
						
						
						Fix typo in MaxAdmin manual 
						
						
					 | 
					
						2015-02-13 15:11:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a65e8be55d
					 | 
					
						
						
							
							Addition of documentation for the .maxadmin file
						
						
						
						
						
						
					 | 
					
						2015-02-13 09:24:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b70762e15
					 | 
					
						
						
							
							Tidy up MaxAdmin documentation after import to Markdown format
						
						
						
						
						
						
					 | 
					
						2015-02-13 09:16:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3193b9aee4
					 | 
					
						
						
							
							Smarten a couple of pages
						
						
						
						
						
						
					 | 
					
						2015-02-05 12:56:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a597a78c5
					 | 
					
						
						
							
							Remove design diagrams from Documentation, tidy up.
						
						
						
						
						
						
					 | 
					
						2015-02-04 09:24:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d49c9c9dd
					 | 
					
						
						
							
							MySQL Cluster NDB Update
						
						
						
						
						
						
						
						MySQL Cluster NDB Update 
						
						
					 | 
					
						2015-01-30 12:49:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2e0ecc2a86
					 | 
					
						
						
							
							Complete addition of Markdown documents
						
						
						
						
						
						
					 | 
					
						2015-01-28 12:12:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |