From 78e65b70b7d9554555a2b52dc1da3345fafe9cfd Mon Sep 17 00:00:00 2001 From: Yingminzhou Date: Wed, 15 Jun 2016 10:37:47 +0000 Subject: [PATCH] merge the po with the upstream 3.2 --- source/includes/steps-deploy-replica-set-with-auth.yaml | 2 +- .../steps-deploy-sharded-cluster-config-server.yaml | 2 +- source/includes/steps-deploy-sharded-cluster-connect.yaml | 2 +- .../steps-enable-authentication-in-sharded-cluster.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/includes/steps-deploy-replica-set-with-auth.yaml b/source/includes/steps-deploy-replica-set-with-auth.yaml index 734406bd302..364c925d79c 100644 --- a/source/includes/steps-deploy-replica-set-with-auth.yaml +++ b/source/includes/steps-deploy-replica-set-with-auth.yaml @@ -52,7 +52,7 @@ action: replSetName: - pre: | Start the :program:`mongod` using the configuration file: - language: shell + language: sh code: | mongod --config post: | diff --git a/source/includes/steps-deploy-sharded-cluster-config-server.yaml b/source/includes/steps-deploy-sharded-cluster-config-server.yaml index b5ce9262c70..af8c6533c5d 100644 --- a/source/includes/steps-deploy-sharded-cluster-config-server.yaml +++ b/source/includes/steps-deploy-sharded-cluster-config-server.yaml @@ -34,7 +34,7 @@ action: - pre: | Start the :program:`mongod` specifying the ``--config`` option and the path to the configuration file. - language: shell + language: sh code: | mongod --config diff --git a/source/includes/steps-deploy-sharded-cluster-connect.yaml b/source/includes/steps-deploy-sharded-cluster-connect.yaml index fb0017c4228..7c81306899f 100644 --- a/source/includes/steps-deploy-sharded-cluster-connect.yaml +++ b/source/includes/steps-deploy-sharded-cluster-connect.yaml @@ -20,7 +20,7 @@ action: - pre: | Start the :program:`mongos` specifying the ``--config`` option and the path to the configuration file. - language: shell + language: sh code: | mongos --config /srv/mongodb/mongos.conf post: | diff --git a/source/includes/steps-enable-authentication-in-sharded-cluster.yaml b/source/includes/steps-enable-authentication-in-sharded-cluster.yaml index e023b99c2bd..06f0feb2ebd 100644 --- a/source/includes/steps-enable-authentication-in-sharded-cluster.yaml +++ b/source/includes/steps-enable-authentication-in-sharded-cluster.yaml @@ -177,7 +177,7 @@ action: - pre: | Start the :program:`mongod` specifying the ``--config`` option and the path to the configuration file. - language: shell + language: sh code: | mongod --config - pre: | @@ -237,7 +237,7 @@ action: - pre: | Start the :program:`mongod` specifying the ``--config`` option and the path to the configuration file. - language: shell + language: sh code: | mongod --config - pre: | @@ -337,7 +337,7 @@ action: - pre: | Start the :program:`mongos` specifying the ``--config`` option and the path to the configuration file. - language: shell + language: sh code: | mongos --config post: |