Merge changes I6ff6c55c,I92b7e285
authorEd Warnicke <eaw@cisco.com>
Wed, 27 Nov 2013 17:08:36 +0000 (17:08 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 27 Nov 2013 17:08:36 +0000 (17:08 +0000)
commit1306d0ed4b53625a1ba83e6aa5d693cd12ce7001
treee076929e0f359981c8a1d3557acf7f9b96dd49d3
parentcf9cefeac29c7ddc26e99a604e6a479e8ae0e68e
parent638093908ccb9f2824e264ab68c789d18b5e93ac
Merge changes I6ff6c55c,I92b7e285

* changes:
  Bug 165 and changed operations
  Json with prefix for augmented elements