Merge changes Ifdaf681e,Ifc13df7c
authorEd Warnicke <eaw@cisco.com>
Mon, 11 Nov 2013 14:09:05 +0000 (14:09 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 11 Nov 2013 14:09:05 +0000 (14:09 +0000)
commit05d3c60109c1d0fc24f0f1ffa3e5aeed929e3c24
treedfdfc6a57280021f66c81ae0a6ddc81bfb6ec667
parenta5df932662bbaec4caeee5478d3003615ed3566b
parentcab23dab8fd05af0ee159c40973ce78712fa2b35
Merge changes Ifdaf681e,Ifc13df7c

* changes:
  Fixed merge of entries in mock data store
  Added paths and mediatypes from Restconf draft 02