Merge lp://qastaging/~drizzle-developers/drizzle/replication-docs-7.1 into lp://qastaging/~drizzle-trunk/drizzle/development
Proposed by
Brian Aker
Status: | Merged |
---|---|
Approved by: | Brian Aker |
Approved revision: | 2533 |
Merged at revision: | 2531 |
Proposed branch: | lp://qastaging/~drizzle-developers/drizzle/replication-docs-7.1 |
Merge into: | lp://qastaging/~drizzle-trunk/drizzle/development |
Diff against target: |
3638 lines (+2031/-1287) (has conflicts) 37 files modified
docs/administration/authentication.rst (+2/-0) docs/administration/authorization.rst (+2/-0) docs/administration/index.rst (+4/-2) docs/administration/plugins.rst (+3/-1) docs/clients/drizzledump.rst (+2/-0) docs/configuration/drizzled.rst (+37/-28) docs/configuration/options.rst (+2/-2) docs/functions/datetime.rst (+4/-0) docs/index.rst (+7/-2) docs/replication/appliers/index.rst (+33/-0) docs/replication/appliers/rabbitmq.rst (+199/-0) docs/replication/appliers/rabbitmq/changelog.rst (+13/-0) docs/replication/appliers/slave.rst (+64/-0) docs/replication/appliers/slave/administration.rst (+332/-0) docs/replication/appliers/slave/changelog.rst (+27/-0) docs/replication/appliers/slave/configuration.rst (+229/-0) docs/replication/appliers/slave/details.rst (+11/-0) docs/replication/appliers/zeromq.rst (+55/-0) docs/replication/drizzle.rst (+0/-324) docs/replication/examples/index.rst (+32/-0) docs/replication/examples/rabbitmq/basic.rst (+55/-0) docs/replication/examples/slave/provision_new_slave.rst (+61/-0) docs/replication/examples/slave/simple_master_slave.rst (+172/-0) docs/replication/index.rst (+172/-0) docs/replication/messages/index.rst (+251/-0) docs/replication/replicators/default.rst (+64/-0) docs/replication/replicators/filtered.rst (+143/-0) docs/replication/replicators/index.rst (+28/-0) plugin/default_replicator/docs/index.rst (+1/-63) plugin/filtered_replicator/docs/index.rst (+1/-142) plugin/innobase/docs/index.rst (+19/-2) plugin/rabbitmq/docs/index.rst (+3/-240) plugin/slave/docs/admin.rst (+0/-136) plugin/slave/docs/index.rst (+1/-162) plugin/slave/docs/user_example.rst (+0/-134) plugin/slave/module.cc (+1/-1) plugin/zeromq/docs/index.rst (+1/-48) Text conflict in docs/functions/datetime.rst |
To merge this branch: | bzr merge lp://qastaging/~drizzle-developers/drizzle/replication-docs-7.1 |
Related bugs: | |
Related blueprints: |
Documentation focus areas for 7.1 release
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Merge Team | Pending | ||
Review via email: mp+98078@code.qastaging.launchpad.net |
To post a comment you must log in.
Please elaborate the content..
Thanks,
Sekhar