Merging and cleaning up previous branches#68
Open
amiramix wants to merge 28 commits intosipXcom:release-16.12from
Open
Merging and cleaning up previous branches#68amiramix wants to merge 28 commits intosipXcom:release-16.12from
amiramix wants to merge 28 commits intosipXcom:release-16.12from
Conversation
trigger build process
-added tcp-timeout setting into etc/sipxpbx/sipxsqa-config default is 100 ms
-replicate tcp timeout in sipxsqa-client.ini too
- refactoring before actual fix: - BlockingTcpClient moved to separate source/include files - friendship of StateQueueClient and BlockingTcpClient removed to avoid interface confusion - some of the BlockingTcpClient methods made private
- magic numbers removed - clean unused code from BlockingClient - read of "tcp-timeout" option added
- magic numbers removed - clean unused code from BlockingClient - read of "tcp-timeout" option added
- magic numbers removed - clean unused code from BlockingClient - read of "tcp-timeout" option added
- BlockingTcpClient.cpp merged back to BlockingTcpClient.h to avoid compiltaion issues
- preparation for IP moval script development.
SIPX-524 Backport from 16.12
…LF/Speed dial check
- generate mongo entires always (not only on live attendant), use expiration of 0 to direct to AA when live attendant not enabled
… development on CentOS
… release-16.08-greg
Conflicts: freeswitch sipXconfig/web/unitelite/index.html sipXconfig/web/unitelite/scripts/136f5540ba8b86199d328694.scripts.js sipXconfig/web/unitelite/scripts/668494ad528c8b5f63df46c4.scripts.js sipXconfig/web/unitelite/scripts/ccee0dece6918f197cfb59a9.scripts.js sipXconfig/web/unitelite/views/settings.html
Conflicts: .gitignore
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
I merged all releases from 16.04 to 16.12 to verify that all changes made in these branches that should be kept have been integrated. Additionally:
sipx_environmentfile.