Skip to content
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.

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

Merge murmur.grpc.ini and murmur.ini #3196

Merged
merged 2 commits into from Jul 23, 2017

Conversation

@mkrautz
Copy link
Member

commented Jul 23, 2017

This merges the extra murmur.grpc.ini into murmur.ini itself. There is no need to have two files.

This PR also adds a warning to Murmur: if Murmur is built without gRPC support, it will warn if any of the 'grpc', 'grpccert', 'grpckey' options are set in the .ini file.

mkrautz added 2 commits Jul 23, 2017
scripts: remove gRPC-specific murmur.ini.
Let's merge the two, and note in the .ini that
not all builds contain gRPC support.

@mkrautz mkrautz requested review from Kissaki, hacst and davidebeatrici Jul 23, 2017

@Kissaki
Copy link
Member

left a comment

The two inis were equal apart from the grpc keys? We did not use the grpc ini? It was just just there so we could point to it if someone wants to use grpc?

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Jul 23, 2017

The two inis were equal apart from the grpc keys? We did not use the grpc ini? It was just just there so we could point to it if someone wants to use grpc?

Correct.

@mkrautz mkrautz merged commit af0b2ec into mumble-voip:master Jul 23, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.