Opened 4 months ago

Closed 2 months ago

#29137 closed defect (fixed)

Standardize 'Bandwidth File' name

Reported by: atagar Owned by:
Priority: Medium Milestone: Tor: 0.4.1.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: 041-proposed, fast-fix, bwauth
Cc: Actual Points:
Parent ID: Points: 0.1
Reviewer: teor Sponsor:

Description

Usually the 'Bandwidth File' spec called its actual documents 'Bandwidth
Lists'. Juga and teor have both said they prefer the term 'Bandwidth File'.
Standardizing this so we have a consistent name for these documents...

https://trac.torproject.org/projects/tor/ticket/28615#comment:9

Fix is available in the 'bandwidth_file_name' branch of my spec repo...

https://gitweb.torproject.org/user/atagar/torspec.git/commit/?h=bandwidth_file_name

Child Tickets

Change History (16)

comment:1 Changed 4 months ago by atagar

Status: newneeds_review

comment:2 in reply to:  description ; Changed 4 months ago by juga

Replying to atagar:

Fix is available in the 'bandwidth_file_name' branch of my spec repo...

https://gitweb.torproject.org/user/atagar/torspec.git/commit/?h=bandwidth_file_name

I think it's fine except for the last 2 lines changes. Maybe create a PR so that it can be reviewed by others?.

comment:3 Changed 4 months ago by teor

Keywords: 041-proposed fast-fix bwauth added
Milestone: Tor: 0.4.1.x-final
Points: 0.1

I suggest that we review this in 0.4.1, without discussing it at the team meeting.

comment:4 Changed 4 months ago by dgoulet

Reviewer: teor

comment:5 in reply to:  2 Changed 3 months ago by teor

Status: needs_reviewneeds_revision

Thanks for this pull request.

Sorry it's taken me a while to get to it, I was at a hackfest, then on leave.

Replying to juga:

Replying to atagar:

Fix is available in the 'bandwidth_file_name' branch of my spec repo...

https://gitweb.torproject.org/user/atagar/torspec.git/commit/?h=bandwidth_file_name

I think it's fine except for the last 2 lines changes. Maybe create a PR so that it can be reviewed by others?.

I opened a pull request at https://github.com/torproject/torspec/pull/57

There are 3 places where the search-and-replace is wrong.
Would you mind reverting them?

Since you made your branch, the file has been updated, so there are merge conflicts.
Would you mind rebasing your changes on master?

comment:6 Changed 3 months ago by teor

This fix conflicts with #29578.

comment:7 in reply to:  6 Changed 3 months ago by teor

Replying to teor:

This fix conflicts with #29578.

#29578 has been merged, please rebase when you revise.

comment:8 Changed 3 months ago by atagar

Status: needs_revisionmerge_ready

Rebased my bandwidth_file_name branch and dealt with the conflicts.

https://gitweb.torproject.org/user/atagar/torspec.git/commit/?h=bandwidth_file_name

comment:9 Changed 3 months ago by nickm

Status: merge_readyneeds_review

I can merge once Teor acks.

comment:10 Changed 3 months ago by teor

One of the changes I requested was not in the updated pull request. That's probably a GitHub UI issue, because the lines were also changed in the rebase.

A added a fixup commit to make the change I requested.

I also added two other commits: one fixes an incorrect description, and the other removes some trailing spaces.

I'm happy for nickm to check my changes, apply the fixup to atagar's commit, then merge.

comment:11 Changed 3 months ago by teor

Status: needs_reviewmerge_ready

comment:12 Changed 3 months ago by nickm

Resolution: fixed
Status: merge_readyclosed

Squashed & merged

comment:13 Changed 3 months ago by atagar

Resolution: fixed
Status: closedreopened

Hi Nick, reopening because I'm not seeing this commit in the repo.

Merge request is for:
https://gitweb.torproject.org/user/atagar/torspec.git/commit/?h=bandwidth_file_name

But not seeing it in:
https://gitweb.torproject.org/torspec.git/log/

comment:14 in reply to:  13 Changed 3 months ago by teor

Status: reopenedmerge_ready

Replying to atagar:

Hi Nick, reopening because I'm not seeing this commit in the repo.

Merge request is for:
https://gitweb.torproject.org/user/atagar/torspec.git/commit/?h=bandwidth_file_name

My extra changes are in https://github.com/torproject/torspec/pull/57 , so let's make sure we merge that.

But not seeing it in:
https://gitweb.torproject.org/torspec.git/log/

I don't see a merge either. Maybe Nick didn't push?

comment:15 Changed 2 months ago by nickm

You're correct, I did forget to push. Better now?

comment:16 Changed 2 months ago by atagar

Resolution: fixed
Status: merge_readyclosed

Yup. Thanks Nick.

Note: See TracTickets for help on using tickets.