From: Ed Warnicke <eaw@cisco.com>
Date: Sat, 1 Feb 2014 16:07:41 +0000 (+0000)
Subject: Merge changes Iae4ee2f2,I148c22c4,I1dab84ae
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~541
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=585f5f29dfebb84f065f3b35c41ce19e8b11bb4b;hp=-c

Merge changes Iae4ee2f2,I148c22c4,I1dab84ae

* changes:
  Additional test for instance-identifier
  BUG 388: corrected media type in /operations resource
  BUG 312: Removed legacy RESTCONF draft 01 syntax
---

585f5f29dfebb84f065f3b35c41ce19e8b11bb4b