Merge remote-tracking branch 'riptano/1.7.0_prep' into 2.11.0_prep

Michael Penick · Michael Penick · commit 36811d6e979d · 2018-12-07T10:43:01.000-05:00
diff --git a/test/ccm_bridge/src/bridge.cpp b/test/ccm_bridge/src/bridge.cpp
@@ -586,7 +586,6 @@ bool CCM::Bridge::create_cluster(std::vector<unsigned short> data_center_nodes,
         } else {
           create_command.push_back(dse_version_.to_string());
         }
-        create_command.push_back("--dse");
         if (dse_credentials_type_ == DseCredentialsType::USERNAME_PASSWORD) {
           create_command.push_back("--dse-username=" + dse_username_);
           create_command.push_back("--dse-password=" + dse_password_);
@@ -603,6 +602,9 @@ bool CCM::Bridge::create_cluster(std::vector<unsigned short> data_center_nodes,
         }
       }
     }
+    if (use_dse_) {
+      create_command.push_back("--dse");
+    }
     create_command.push_back("-b");
 
     // Determine if password authenticator or SSL and client authentication

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,6 @@ bool CCM::Bridge::create_cluster(std::vector<unsigned short> data_center_nodes,`
`586`	`586`	`} else {`
`587`	`587`	`create_command.push_back(dse_version_.to_string());`
`588`	`588`	`}`
`589`		`- create_command.push_back("--dse");`
`590`	`589`	`if (dse_credentials_type_ == DseCredentialsType::USERNAME_PASSWORD) {`
`591`	`590`	`create_command.push_back("--dse-username=" + dse_username_);`
`592`	`591`	`create_command.push_back("--dse-password=" + dse_password_);`
`@@ -603,6 +602,9 @@ bool CCM::Bridge::create_cluster(std::vector<unsigned short> data_center_nodes,`
`603`	`602`	`}`
`604`	`603`	`}`
`605`	`604`	`}`
	`605`	`+ if (use_dse_) {`
	`606`	`+ create_command.push_back("--dse");`
	`607`	`+ }`
`606`	`608`	`create_command.push_back("-b");`
`607`	`609`
`608`	`610`	`// Determine if password authenticator or SSL and client authentication`