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

Data Collector mechanic and sample implementation #1252

Closed
wants to merge 2 commits into from

Conversation

adamsero
Copy link
Contributor

This PR contains the last 3 commits from opl/timestamp_nodes_support_for_client

@sbernard31
Copy link
Contributor

@adamsero, maybe I don't know what you try to achieve with your last commit but just in case :

In a general way, we don't use merge in Leshan, we prefer rebase to keep a clearer history.

In this particular case, IF you want to start your work based on #1255 and keep this PR THEN
I advice to rather reset hard your branch on data_collector branch
Then you can rebase it on master if you want (you can even squashed all commit from #1225 in one eventually)

@adamsero
Copy link
Contributor Author

adamsero commented Jun 1, 2022

Sorry, that was unrelated, I accidentally updated a branch on our forked repo. I'm using a clean branch and I'll be adding the features gradually.

@sbernard31
Copy link
Contributor

Ok no problem :)
(Eventually you can reset --hard your Przem83:opl/data_collector branch on commit 43ed69f, then push --force the Przem83:opl/data_collector branch, if you want to put this PR again in a "right" state)

@sbernard31
Copy link
Contributor

Data Collector was replaced by Data Sender. (See #1274)

@sbernard31 sbernard31 closed this Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants