search

MichaelWallace30 / CommProtocol

SImple generic Protocol for communication
2 stars 8 forks source link

Thread safety to autoqueue. Change UdpLink::map to UdpLink::clients. #34

Closed Jester565 closed 7 years ago

Jester565 commented 7 years ago

Sorry for making this a pull request. I don't really know another way of going about this.

MichaelWallace30 commented 7 years ago

I merged the wrong way on Friday. I dont know what this is, but it looks like its messed up.

MichaelWallace30 commented 7 years ago

The revert failed and Mario forced a push that fixed it. I see the revert in the commits.

Jester565 commented 7 years ago

So the ping repository is messed up even though it has the revert?

On Sun, Nov 20, 2016, 11:33 AM MichaelWallace30 notifications@github.com wrote:

The revert failed and Mario forced a push that fixed it. I see the revert in the commits.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/MichaelWallace30/CommProtocol/pull/34#issuecomment-261799513, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ3NDLiKyfwCxFAhk5maB_T-pOoz2f3yks5rAKBwgaJpZM4K3nkS .

MichaelWallace30 commented 7 years ago

The revert is the issue.

MichaelWallace30 commented 7 years ago

It didnt revert recent changes you and Mario made.

Jester565 commented 7 years ago

Ok I'll revert my pull request when I can

On Sun, Nov 20, 2016, 11:40 AM MichaelWallace30 notifications@github.com wrote:

It didnt revert recent changes you and Mario made.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/MichaelWallace30/CommProtocol/pull/34#issuecomment-261799982, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ3NDP3fSJoVWuMS_Ih8hFlSeK5sRA00ks5rAKI8gaJpZM4K3nkS .

MichaelWallace30 commented 7 years ago

I think you need to do a force push or pull. I would wait for Mario to wake up.

Jester565 commented 7 years ago

Save us Mario!

On Sun, Nov 20, 2016, 11:43 AM MichaelWallace30 notifications@github.com wrote:

I think you need to do a force push or pull. I would wait for Mario to wake up.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/MichaelWallace30/CommProtocol/pull/34#issuecomment-261800122, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ3NDN2X3sQt2KIjhNrQik32NDNeYN1vks5rAKLIgaJpZM4K3nkS .

Jester565 commented 7 years ago

Maybe we can just delete the entire branch and create a new one from master?

MichaelWallace30 commented 7 years ago

Yeah man you can do what ever.

Jester565 commented 7 years ago

Worst comes to worst we trash this branch, but I think I fixed it. Maybe. I would never do this with the master branch though.

On Sun, Nov 20, 2016 at 12:53 PM MichaelWallace30 notifications@github.com wrote:

Yeah man you can do what ever.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/MichaelWallace30/CommProtocol/pull/34#issuecomment-261804859, or mute the thread https://github.com/notifications/unsubscribe-auth/AQ3NDI7BzL4bkan7O9V-01qb6JRsLP5nks5rALNDgaJpZM4K3nkS .