Change in ovirt-engine[master]: restapi: Fix botched merge

[amureini at redhat.com]

Allon Mureinik has submitted this change and it was merged.

Change subject: restapi: Fix botched merge
......................................................................


restapi: Fix botched merge

Reintroduced acked changes to test files that were mistakenly removed in
a bad merge of If351d209d7828f0d59926bb98da9317567976d41.

Relates-To: https://bugzilla.redhat.com/show_bug.cgi?id=990962
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
Signed-off-by: Allon Mureinik <amureini at redhat.com>
Change-Id: Ia5667a149b7ad832aab6457cb333fa781952c411
---
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDiskResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java
4 files changed, 119 insertions(+), 0 deletions(-)

Approvals:
  Federico Simoncelli: Looks good to me, but someone else must approve
  Allon Mureinik: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/19357
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5667a149b7ad832aab6457cb333fa781952c411
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>