Multiple revisions 400508,400842-400843,400848
authorDavid M. Lee <dlee@digium.com>
Fri, 11 Oct 2013 16:36:00 +0000 (16:36 +0000)
committerDavid M. Lee <dlee@digium.com>
Fri, 11 Oct 2013 16:36:00 +0000 (16:36 +0000)
commit9234804a3bf81f2df18c2f9dd9680d848ff21e48
treeaa8195dfe160f7070dc72c93f4a2042287ac4fa5
parent07e2b1d02839a4a8cb6320a0b4ee41ba613c6e56
Multiple revisions 400508,400842-400843,400848

........
  r400508 | dlee | 2013-10-03 23:54:51 -0500 (Thu, 03 Oct 2013) | 1 line

  Corrected response class for stopPlayback
........
  r400842 | dlee | 2013-10-10 14:23:24 -0500 (Thu, 10 Oct 2013) | 1 line

  Correct some ARI wiki rendering errors
........
  r400843 | dlee | 2013-10-10 14:26:19 -0500 (Thu, 10 Oct 2013) | 1 line

  Updated /play resource docs. The playback of http: resources isn't implemented... yet
........
  r400848 | dlee | 2013-10-11 11:18:46 -0500 (Fri, 11 Oct 2013) | 5 lines

  Fix a stupid copy/paste error in ARI docs.

  Patches:
      ari-doc-patch.txt uploaded by jbigelow (license 5091)
........

Merged revisions 400508,400842-400843,400848 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/ari/resource_bridges.h
res/ari/resource_channels.h
res/ari/resource_playback.h
res/res_ari_playback.c
rest-api-templates/api.wiki.mustache
rest-api-templates/asterisk_processor.py
rest-api-templates/models.wiki.mustache
rest-api/api-docs/bridges.json
rest-api/api-docs/channels.json
rest-api/api-docs/playback.json