search

AllStarLink / app_rpt

Refactoring and upgrade of AllStarLink's app_rpt, etc.
5 stars 4 forks source link

Asl3 configs #241

Closed tsawyer closed 10 months ago

tsawyer commented 10 months ago

While branch is 8 commits ahead of the master and some of those commits were previously merged I believe it's ok to merge all 8 commits. This PR will correct my screw up of doing a 'git reset --hard HEAD~2' on this branch.

encbar5 commented 10 months ago

@tsawyer , I think all you were trying to do is change the comments next to the timerfd.so module? At least that seems to be the only difference between this branch and master. I created a new branch called asl3_configs_one_commit, and tried to fix all of your history issues by rebasing. Maybe you want to take a look at that branch, and if it looks good make a pull request using it?

tsawyer commented 10 months ago

Thank you @encbar5. That's done.

tsawyer commented 10 months ago

@InterLinked1 I assume this branch can't be fixed. Should it be deleted?

InterLinked1 commented 10 months ago

@InterLinked1 I assume this branch can't be fixed. Should it be deleted?

That should be fine, the other change is merged so there shouldn't be anything outstanding here.