Sccp co users on the same stack #280
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ss7-43-sccp-co-mrg Conflicts: sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
Conflicts: sccp/sccp-api/src/main/java/org/mobicents/protocols/ss7/sccp/SccpProvider.java sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpProviderImpl.java
for other stacks
updates Conflicts: sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
Conflicts: sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java
for messages, some changes in 2 unit tests for deaper testing
Conflicts: .gitignore sccp/sccp-api/src/main/java/org/mobicents/protocols/ss7/sccp/SccpProvider.java sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpProviderImpl.java sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpRoutingControl.java sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImpl.java tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/CreateDialogTest.java tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/PreviewModeFunctionalTest.java tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/concurrent/DialogPreviewModeMngConcurrentTest.java tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/CreateDialogTest.java tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/PreviewModeFunctionalTest.java tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/concurrent/DialogPreviewModeMngConcurrentTest.java tools/trace-parser/parser/src/main/java/org/mobicents/protocols/ss7/tools/traceparser/SccpProviderWrapper.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: