[4/4] incubator-rocketmq-externals git commit: Remove conflict contents

[yu...@apache.org]

Remove conflict contents


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/commit/90be3667
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/tree/90be3667
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/diff/90be3667

Branch: refs/heads/master
Commit: 90be3667aefb1409e05deceb7c72ce53f85c5bb6
Parents: b5ee908
Author: vongosling <vo...@apache.org>
Authored: Thu Jun 15 17:25:56 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Thu Jun 15 17:38:57 2017 +0800

----------------------------------------------------------------------
 rocketmq-mysql/README.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/90be3667/rocketmq-mysql/README.md
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/README.md b/rocketmq-mysql/README.md
index cd3b54c..92686fd 100644
--- a/rocketmq-mysql/README.md
+++ b/rocketmq-mysql/README.md
@@ -41,14 +41,4 @@ in a simple and low cost method.
 |startType         |true    |NEW_EVENT  |The way that the replicator starts processing data,there are three options available:<br>- NEW_EVENT： starts processing data from the tail of binlog<br>- LAST_PROCESSED: starts processing data from the last processed event<br>- SPECIFIED:starts processing data from the position that user specified,if you choose this option,the binlogFilename and nextPosition must not be null|
 |binlogFilename    |true    |           |If "startType" is "SPECIFIED",the replicator will begin to replicate from this binlog file|
 |nextPosition      |true    |           |If "startType" is "SPECIFIED",the replicator will begin to replicate from this position|
-|maxTransactionRows|true    |100        |max rows of the transaction pushed to RocketMQ|
-=======
-The RocketMQ-MySQL is a data replicator between MySQL and other system,the replicator parse the binglog event and send it in json format to the RocketMQ,and other system can pull data from RocketMQ.
-## Dataflow
-![dataflow](./doc/dataflow.png)
-
-* 1.Firstly,get the last data from the queue,and get the binglog position from this data,and if the queue data is null,then use the latest binglog position of the MySQL,and surely user can also specify this position on his own;
-* 2.Send a binlog dump request to the MySQL;
-* 3.The MySQL push binglog event to the Replicator,the Replicator parse the data and accumulate as a transaction-object;
-* 4.Add the next-position of the transaction to the transaction-object and send it in json format to the queue;
-* 5.Record the binglog position and the offset in the queue of the latest transaction every second.
+|maxTransactionRows|true    |100        |max rows of the transaction pushed to RocketMQ|
\ No newline at end of file