From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 11 Nov 2013 14:09:05 +0000 (+0000)
Subject: Merge changes Ifdaf681e,Ifc13df7c
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~434
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=05d3c60109c1d0fc24f0f1ffa3e5aeed929e3c24

Merge changes Ifdaf681e,Ifc13df7c

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

05d3c60109c1d0fc24f0f1ffa3e5aeed929e3c24