experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Alan Yaniger 2021-08-06 12:08:13 +03:00
commit f2e81be66e
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/restconf/restconf_methods.c
View file

@ -1379,16 +1379,17 @@ api_data_patch(clicon_handle h,
ret = api_data_write(h, req, api_path0, pcvec, pi, qvec, data, pretty, ret = api_data_write(h, req, api_path0, pcvec, pi, qvec, data, pretty,
media_in, media_out, 1, ds); media_in, media_out, 1, ds);
break; break;
case YANG_PATCH_JSON: /* RFC 8072 patch */
case YANG_PATCH_XML: case YANG_PATCH_XML:
ret = restconf_notimplemented(h, req, pretty, media_out);
break;
case YANG_PATCH_JSON: /* RFC 8072 patch */
#ifdef YANG_PATCH #ifdef YANG_PATCH
ret = api_data_yang_patch(h, req, api_path0, pcvec, pi, qvec, data, pretty, ret = api_data_yang_patch(h, req, api_path0, pcvec, pi, qvec, data, pretty,
media_out, ds); media_out, ds);
#else #else
ret = restconf_notimplemented(h, req, pretty, media_out); ret = restconf_unsupported_media(h, req, pretty, media_out);
#endif #endif
break; break;
break;
default: default:
ret = restconf_unsupported_media(h, req, pretty, media_out); ret = restconf_unsupported_media(h, req, pretty, media_out);
break; break;