Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

asterisk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e7de71ee

Commit e7de71ee authored 5 years ago by Friendly Automation Committed by Gerrit Code Review 5 years ago

Downloads
- Plain Diff

Merge "main/json.c: Added app_name, app_data to channel type" into 13

parents 7b64432c 707897e5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/asterisk/json.h 16 additions, 0 deletions

include/asterisk/json.h
main/json.c 13 additions, 4 deletions

main/json.c
main/stasis_channels.c 3 additions, 2 deletions

main/stasis_channels.c
res/ari/ari_model_validators.c 32 additions, 0 deletions

res/ari/ari_model_validators.c
res/ari/ari_model_validators.h 2 additions, 0 deletions

res/ari/ari_model_validators.h
rest-api/api-docs/channels.json 10 additions, 0 deletions

rest-api/api-docs/channels.json
tests/test_json.c 12 additions, 6 deletions

tests/test_json.c
tests/test_stasis_channels.c 3 additions, 1 deletion

tests/test_stasis_channels.c

with 91 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment