Commit Graph

560 Commits

Author SHA1 Message Date
83abf0858b Merge branch 'develop' into schemarouter_refresh 2015-08-12 16:49:37 +03:00
c2cf2b152f Added escaped newlines to document. 2015-08-10 19:59:52 +03:00
c0584acabb Merge branch 'develop' into schemarouter_refresh
Conflicts:
	Documentation/Tutorials/Replication-Proxy-Binlog-Router-Tutorial.md
2015-08-08 11:25:54 +03:00
2c090a9690 Updated limitations. 2015-08-06 19:10:41 +03:00
2b0cbe67c9 Updated documentation. 2015-08-04 11:19:34 +03:00
22719697a8 Fixed typos. 2015-07-24 12:21:55 +03:00
f90463688f Merge branch 'master' into schemarouter_refresh 2015-07-22 18:35:22 +03:00
d2b150144d Added example to Hint-Syntax.md 2015-07-22 17:34:19 +03:00
659a232632 Documentation Update
Documentation Update
2015-07-22 15:14:43 +02:00
8c34a29914 Documentation update
Documentation update
2015-07-22 15:11:34 +02:00
d079e1d315 Added missing MariaDB 10 binlog documentation. 2015-07-21 16:31:41 +03:00
b5bbb8f8ac Added missing MariaDB 10 binlog documentation. 2015-07-21 16:30:49 +03:00
c35ff23847 Merge branch 'master' into schemarouter_refresh 2015-07-20 11:42:43 +03:00
37ee4149b2 Merge branch 'master' into develop 2015-07-16 05:52:09 +03:00
6ee4f5f655 Fixed type in documentation. 2015-07-16 05:46:22 +03:00
73a388ea0b Merged 'master' into develop. 2015-07-15 17:21:24 +03:00
21a6d63bc0 Fixed broken link. 2015-07-15 17:17:47 +03:00
feeb4c590b Merge branch 'release-1.2'
Conflicts:
	Documentation/Documentation-Contents.md
2015-07-15 16:34:27 +03:00
c51950ed09 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-15 15:00:35 +03:00
b03d6fcfd8 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
1e5253768c Add blank line to start of Document Contents (link otherwise not rendered correctly by web site); move upgrade documents into their own directory; modify poll.c to fix problem relating to cloned DCBs. 2015-07-15 08:35:50 +01:00
39cad90d67 Merge branch 'release-1.2' into MXS-230 2015-07-14 13:10:57 +03:00
3f273fd04a Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:37:00 +03:00
8f8c901396 Merge branch 'release-1.2' into develop 2015-07-13 19:22:49 +03:00
8fb5c7c443 Fixed title. 2015-07-13 19:22:06 +03:00
e84f02db92 Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:10:05 +03:00
15d4624643 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
0601d5e555 Merge branch 'doc_changes' into release-1.2 2015-07-13 15:17:42 +03:00
ffdd63ed66 Merge branch 'priority_galeramon' into develop 2015-07-13 14:39:33 +03:00
40839a2f9b Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
7109e6f9ce Merge branch 'release-1.2' into MXS-230 2015-07-13 13:08:37 +03:00
a9bb8094f7 Updated documents. 2015-07-12 22:59:19 +03:00
c4414e708b Merge branch 'release-1.2' into develop
Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
2015-07-11 17:12:48 +03:00
244f9aadde Fixed release note titles. 2015-07-10 22:23:10 +03:00
797f1fa1b5 Merge branch 'release-1.2' into doc_changes 2015-07-10 14:18:45 +03:00
11dc67ffb4 Moved password encryption from configuration guide to getting started. 2015-07-10 14:18:20 +03:00
9d857b1587 Added missing link 2015-07-10 13:52:42 +03:00
27a6e4ab19 Added missing namedserverfilter documentation. 2015-07-10 13:51:32 +03:00
34e5fdbb72 Fixed typo. 2015-07-10 13:23:08 +03:00
90c502bec2 Updated the getting started document. 2015-07-10 13:01:56 +03:00
211474563c Fixed links. 2015-07-09 23:52:31 +03:00
e3fb72d3b6 Added link to simple sharding tutorial. 2015-07-09 23:26:19 +03:00
fd79515ee5 Fixed broken links. 2015-07-09 22:28:24 +03:00
f21d08be4a Added template cnf file to /etc and renamed folders. 2015-07-09 14:41:23 +03:00
9c1df7301d Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
e47ead41a2 Added reference to hint document to rwsplit docs. 2015-07-08 12:42:48 +03:00
9af71369f8 Added more precise documentation for galeramon priority. 2015-07-07 21:40:30 +03:00
c60c38794c Added error message about MySQL versions lower than 5.5 and monitors without the 'mysql51_replication' enabled. 2015-07-07 20:14:57 +03:00
b9ccdad5c7 Merge branch 'develop' into MXS-230 2015-07-07 19:45:42 +03:00
6185397572 Added lsyncd guide to release notes. 2015-07-07 16:22:26 +03:00