From 2b2318c08de82340ccd411bf928d6e9847998e46 Mon Sep 17 00:00:00 2001 From: CaoShuFeng Date: Sun, 4 Mar 2018 03:37:54 +0800 Subject: [PATCH] fix description about zookeeper (#7598) s/achive/achieve --- docs/tutorials/stateful-application/zookeeper.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/tutorials/stateful-application/zookeeper.md b/docs/tutorials/stateful-application/zookeeper.md index 9535499655f8a..a777f99c72cf2 100644 --- a/docs/tutorials/stateful-application/zookeeper.md +++ b/docs/tutorials/stateful-application/zookeeper.md @@ -501,8 +501,16 @@ As noted in the [Facilitating Leader Election](#facilitating-leader-election) an [Achieving Consensus](#achieving-consensus) sections, the servers in a ZooKeeper ensemble require consistent configuration in order to elect a leader and form a quorum. They also require consistent configuration of the Zab protocol +<<<<<<< HEAD in order for the protocol to work correctly over a network. In our example we achieve consistent configuration by embedding the configuration directly into +||||||| merged common ancestors +in order for the protocol to work correctly over a network. In our example we +achive consistent configuration by embedding the configuration directly into +======= +in order for the protocol to work correctly over a network. In our example we +achieve consistent configuration by embedding the configuration directly into +>>>>>>> fix description about zookeeper (#7598) the manifest. Get the `zk` StatefulSet.