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

Swam server for wafl #11

Merged
merged 105 commits into from
Aug 26, 2020
Merged

Swam server for wafl #11

merged 105 commits into from
Aug 26, 2020

Conversation

tareq97-zz
Copy link

@tareq97-zz tareq97-zz commented Aug 24, 2020

No description provided.

olapiv added 30 commits June 18, 2020 15:30
…Function & executeFunction. Created first basic Server file.
…xed anymore; Fixed measure time; Parsing received socket message to byte array.
@monperrus
Copy link
Member

conflicts there, @Jacarte takes care about them

@monperrus
Copy link
Member

CI is red. Why? Fix or merge?

@Jacarte
Copy link
Member

Jacarte commented Aug 26, 2020

CI is red. Why? Fix or merge?

It is red due to code format checking, this was fixed by Lucas in his repo. It will be fixed once we sync the two master branches

@Jacarte
Copy link
Member

Jacarte commented Aug 26, 2020

Now the tests are failing. Fixing...

@monperrus
Copy link
Member

What about backporting only the code checking changes from Luacs' master there?

@Jacarte
Copy link
Member

Jacarte commented Aug 26, 2020

What about backporting only the code checking changes from Luacs' master there?

My mistake, the rule still exists if it is a PR, I thought it was removed. I think is better for now if we run ./millw __.reformat before pushing to a PR.

@monperrus
Copy link
Member

OK, everything is green and approved, we can merge.

@monperrus monperrus merged commit e0728af into master Aug 26, 2020
@monperrus monperrus deleted the feature/swam-server branch August 26, 2020 11:51
@monperrus
Copy link
Member

Excellent job gentlemen!

@olapiv
Copy link
Collaborator

olapiv commented Aug 27, 2020

Hey, I just saw this. So we're okay with having the socket server in master? Because last thing I knew was that Lucas only wanted the coverage part?

@monperrus
Copy link
Member

monperrus commented Aug 27, 2020 via email

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.

5 participants