OctoPrint-Prometheus-Exporter icon indicating copy to clipboard operation
OctoPrint-Prometheus-Exporter copied to clipboard

Published 20 hours ago • verified publisher icon tg44

Current PRs state

Open tg44 opened this issue 1 year ago • 2 comments
trafficstars

Hy there!

@hyperair and @loelkes You two have open PRs right now. As I see #34 is a big changeset, and I want to merge it, it also conflicting right now. So I would like to get a rebase+forcepush on that, so I can merge it.

The other two PRs (#41 and #42 ) are quite small, if I merge the huge one, we should rebase/redo them and merge them separately.

Is this ok for you two?

tg44 avatar Feb 05 '24 13:02 tg44

yep no problem

hyperair avatar Feb 05 '24 13:02 hyperair

I've already merged `main' into my branch, so there shouldn't be any conflicts. I could also merge #41 and #42 directly into my branch, and add a feature to specify the timeout reset delay in the GUI configuration, rather than having a hard-coded value there.

loelkes avatar Feb 11 '24 22:02 loelkes