[asterisk-commits] dlee: branch dlee/record r393549 - in /team/dlee/record: res/ rest-api/api-docs/

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Jul  3 12:56:51 2013
New Revision: 393549

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393549
Log:
Merged different 409 codes, to play better with the validator

Modified:
    team/dlee/record/res/res_stasis_http_channels.c
    team/dlee/record/rest-api/api-docs/channels.json

Modified: team/dlee/record/res/res_stasis_http_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/record/res/res_stasis_http_channels.c?view=diff&rev=393549&r1=393548&r2=393549
==============================================================================
--- team/dlee/record/res/res_stasis_http_channels.c (original)
+++ team/dlee/record/res/res_stasis_http_channels.c Wed Jul  3 12:56:51 2013
@@ -790,8 +790,7 @@
 	case 500: /* Internal server error */
 	case 400: /* Invalid parameters */
 	case 404: /* Channel not found */
-	case 409: /* Channel is not in a Stasis application, or the channel is currently bridged with other channels. */
-	case 409: /* A recording with the same name is currently in progress. */
+	case 409: /* Channel is not in a Stasis application; the channel is currently bridged with other channels; A recording with the same name is currently in progress. */
 		is_valid = 1;
 		break;
 	default:

Modified: team/dlee/record/rest-api/api-docs/channels.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/record/rest-api/api-docs/channels.json?view=diff&rev=393549&r1=393548&r2=393549
==============================================================================
--- team/dlee/record/rest-api/api-docs/channels.json (original)
+++ team/dlee/record/rest-api/api-docs/channels.json Wed Jul  3 12:56:51 2013
@@ -640,11 +640,7 @@
 						},
 						{
 							"code": 409,
-							"reason": "Channel is not in a Stasis application, or the channel is currently bridged with other channels."
-						},
-						{
-							"code": 409,
-							"reason": "A recording with the same name is currently in progress."
+							"reason": "Channel is not in a Stasis application; the channel is currently bridged with other channels; A recording with the same name is currently in progress."
 						}
 					]
 				}