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

Jump to bottom

Bug30058 #17

Merged
merged 2 commits into from Apr 12, 2019
Merged

Bug30058 #17

merged 2 commits into from Apr 12, 2019

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@teor2345 @torproject-pusher
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Apr 7, 2019

No description provided.

teor2345 added 2 commits Apr 7, 2019
@teor2345
bootstrap-network: Log the flavour name that's actually being used
b03e5a3 
Part of 30058.
@teor2345
bootstrap-network: Actually use the first argument as the network fla…
f6d4095 
…vour

Before these bug 30058 fixes, bootstrap-network.sh:
* Logged the first argument as the network flavour
  * default: basic (when there are no arguments)
* Passed $NETWORK_FLAVOUR to chutney as the network flavour

Now, bootstrap-network.sh:
* Uses the first argument as the network flavour
  * default: $NETWORK_FLAVOUR (when there are no arguments)
  * default: bridges+hs-v2 (when $NETWORK_FLAVOUR is not set)
    * This default is the same as test-network.sh's default
* Logs the network flavour
* Passes the network flavour to chutney

Fixes bug 30058; bugfix on commit 822b30c in February 2017.
@torproject-pusher torproject-pusher merged commit f6d4095 into torproject:master Apr 12, 2019
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment