Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api

This commit is contained in:
Michael Hackstein 2017-02-08 15:46:15 +01:00
parent dfc9f29e69 4fa4259c59
commit 56aecc948d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangosh/Shell/ClientFeature.cpp
View File

@ -63,7 +63,7 @@ void ClientFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
new StringParameter(&_databaseName));
options->addOption("--server.authentication",
"require authentication when connecting",
"require authentication credentials when connecting (does not affect the server-side authentication settings)",
new BooleanParameter(&_authentication));
options->addOption("--server.username",
@ -89,9 +89,9 @@ void ClientFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
"request timeout in seconds",
new DoubleParameter(&_requestTimeout));
options->addOption("--server.max-packet-size",
"maximum packet size (in bytes) for client/server communication",
new UInt64Parameter(&_maxPacketSize));
options->addHiddenOption("--server.max-packet-size",
"maximum packet size (in bytes) for client/server communication",
new UInt64Parameter(&_maxPacketSize));
std::unordered_set<uint64_t> sslProtocols = {1, 2, 3, 4, 5};

6
lib/ApplicationFeatures/ConfigFeature.cpp
View File

@ -61,9 +61,9 @@ void ConfigFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
options->addHiddenOption("--define,-D", "define key=value for a @key@ entry in config file",
new VectorParameter<StringParameter>(&_defines));
options->addOption("--check-configuration",
"check the configuration and exit",
new BooleanParameter(&_checkConfiguration));
options->addHiddenOption("--check-configuration",
"check the configuration and exit",
new BooleanParameter(&_checkConfiguration));
}
void ConfigFeature::loadOptions(std::shared_ptr<ProgramOptions> options,

2
lib/ApplicationFeatures/TempFeature.cpp
View File

@ -44,7 +44,7 @@ TempFeature::TempFeature(application_features::ApplicationServer* server,
void TempFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
options->addOldOption("temp-path", "temp.path");
options->addSection("temp", "Configure the temporary files");
options->addSection("temp", "Configure temporary files");
options->addOption("--temp.path", "path for temporary files",
new StringParameter(&_path));