Skip to content

Removed obsolete --cluster.my-local-info option #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ewoutp merged 2 commits into from
Oct 19, 2017
Merged

Removed obsolete --cluster.my-local-info option #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
559467a
Removed obsolete `--cluster.my-local-info` option
ewoutp Oct 19, 2017
69bd46f
Keep travis happy
ewoutp Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ script: make $TEST_SUITE
# 3.1 cluster startup is not always a success, causing lots of false positive.
matrix:
allow_failures:
- env: TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.1
- env: TEST_SUITE=run-tests-docker ARANGODB=arangodb:3.1
- env: TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
- env: TEST_SUITE=run-tests-docker ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"

# Install Docker CE
before_install:
Expand Down
2 changes: 0 additions & 2 deletions service/arangod_config_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,13 @@ func createArangodArgs(log *logging.Logger, config Config, clusterConfig Cluster
options = append(options,
optionPair{"--cluster.my-address", myTCPURL},
optionPair{"--cluster.my-role", "PRIMARY"},
optionPair{"--cluster.my-local-info", myTCPURL},
optionPair{"--foxx.queues", "false"},
optionPair{"--server.statistics", "true"},
)
case ServerTypeCoordinator:
options = append(options,
optionPair{"--cluster.my-address", myTCPURL},
optionPair{"--cluster.my-role", "COORDINATOR"},
optionPair{"--cluster.my-local-info", myTCPURL},
optionPair{"--foxx.queues", "true"},
optionPair{"--server.statistics", "true"},
)
Expand Down
1 change: 0 additions & 1 deletion service/passthrough.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ var (
"cluster.agency-endpoint",
"cluster.my-address",
"cluster.my-role",
"cluster.my-local-info",
"database.directory",
"javascript.startup-directory",
"javascript.app-path",
Expand Down