[incubator-pulsar] branch master updated: remove master and slave references from C++ API docs (#1140)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new e82be83  remove master and slave references from C++ API docs (#1140)
e82be83 is described below

commit e82be833c04c9e7325dfe5d86eda4d5dc375f9eb
Author: Luc Perkins <lu...@gmail.com>
AuthorDate: Wed Jan 31 10:42:13 2018 -0800

    remove master and slave references from C++ API docs (#1140)
---
 pulsar-client-cpp/include/pulsar/ConsumerConfiguration.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pulsar-client-cpp/include/pulsar/ConsumerConfiguration.h b/pulsar-client-cpp/include/pulsar/ConsumerConfiguration.h
index 2f72eb8..c73f942 100644
--- a/pulsar-client-cpp/include/pulsar/ConsumerConfiguration.h
+++ b/pulsar-client-cpp/include/pulsar/ConsumerConfiguration.h
@@ -55,11 +55,11 @@ class ConsumerConfiguration {
      * only a single consumer is allowed to attach to the subscription. Other consumers
      * will get an error message. In Shared subscription, multiple consumers will be
      * able to use the same subscription name and the messages will be dispatched in a
-     * round robin fashion. In Failover subscription, a master-slave subscription model
+     * round robin fashion. In Failover subscription, a primary-failover subscription model
      * allows for multiple consumers to attach to a single subscription, though only one
-     * of them will be “master” at a given time. Only the master consumer will receive
-     * messages. When the master gets disconnected, one among the slaves will be promoted
-     * to master and will start getting messages.
+     * of them will be “master” at a given time. Only the primary consumer will receive
+     * messages. When the primary consumer gets disconnected, one among the failover
+     * consumers will be promoted to primary and will start getting messages.
      */
     ConsumerConfiguration& setConsumerType(ConsumerType consumerType);
     ConsumerType getConsumerType() const;

-- 
To stop receiving notification emails like this one, please contact
mmerli@apache.org.