Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/OF-2559_mina-to-netty' into OF-2…
…559_mina-to-netty # Conflicts: # xmppserver/src/main/java/org/jivesoftware/openfire/net/RespondingServerStanzaHandler.java # xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java # xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java # xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java # xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalOutgoingServerSessionTest.java # xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteReceivingServerDummy.java
- Loading branch information