search

AllStarLink / app_rpt

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

Asl3 configs #239

Closed tsawyer closed 10 months ago

tsawyer commented 10 months ago

Set and comment that res_timing_timerfd.so is the preferred timing module for ASL3.

InterLinked1 commented 10 months ago

Wasn't most of this already done in commit 015c612eb32f16a57c8017ef2a16411f1ea1f1ee ?

tsawyer commented 10 months ago

Looks like you are right. Not sure what happened there . All I'm adding is the res_timing_timerfd and res_dahdi_timing comments in modules.conf.

InterLinked1 commented 10 months ago

Maybe you're reusing the same PR somehow, since it contains merged changes? It seems like it thinks there's no conflicts, but I'm not fully sure what would happen if we merge it again.

tsawyer commented 10 months ago

Is there a way to revert to the way it was?

InterLinked1 commented 10 months ago

Is there a way to revert to the way it was?

You could try rebasing off the current master branch

tsawyer commented 10 months ago

I think the origin got messed up. It will need to be fixed on your end.

tsawyer commented 10 months ago

It looks like the first three commits are already in the Master branch. So I'm closing this PR w/o merging.