Repository navigation
Update Netty to 4.1.136. - #442
Conversation
Sync from master
…be the only content. Change initiate to initialize.
…rialized code objects of oversized functions, methods and modules.
Sync changes from "Exposed annotations documented" to resolve merge conflicts with master.
|
The magic here is merely smoke and mirrors: Newer Netty was just missing |
|
Ah, this also fixes #434 , forgot to mention it in NEWS. However, rerunning tests just for this little entry is not worth it. I'll add it with the next chunk of dependency updates. |
Good detective work! Also, this will have been difficult to spot on my Windows box ... but is there a Windows equivalent I wonder? I may be able to check. However, your PR is signalling that it cannot be merged. Somewhere I think you submitted one or more PRs from The bigger reset would be to rename your fork repo to something else, and make a fresh clone under the |
|
For me, it signals "Ready to merge". I would just hit "squash and merge" and be done. Including merges from master is just usual upstream sync. Github now does strange things when merge conflicts are fixed - it insists to merge into cloned master (or create yet another branch), which causes some additional noise. One time it opened on own behalf an upstream PR to Jython master, which I immediately closed again. Still, there is no indication for me that squash and merge would not hide away all this noise. For project history it should result just in one "Update Netty" PR. |
|
Runs ok on my machine despite the tortured history and no windows-specificity. |
The button (defaulted to rebase) was so greyed-out it looked like I was stuck, but actually one can still switch to squash and then it's green.
That's odd but there we are.
They test with the network resource enabled. Some specific tests are excluded as troublesome, choices we ought to reconsider sometime.
When I tested, I pulled down the PR branch with |
|
With a squash, the only downside of the tortuous history in the end is that GH wants to include a lot of commmit messages from the apparent history. |
Conflicts: build.gradle build.xml
Fixes #349