Change in ovirt-engine[master]: engine: Add missing fence option type

[emesika at redhat.com]

Eli Mesika has submitted this change and it was merged.

Change subject: engine: Add missing fence option type
......................................................................


engine: Add missing fence option type

- The newly added encrypt_options parameter did not have a type defined
  in the database, this caused parsing to fail and in some cases jboss
  wouldn't start. This patch fixes the issue and adds a unit test
  demonstrating the fix works.

Change-Id: I305de12cdaeac8c018fb5282b3bc0592a1252d20
Signed-off-by: Alexander Wels <awels at redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
2 files changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Eli Mesika: Looks good to me, approved
  Juan Hernandez: Looks good to me, but someone else must approve
  Alexander Wels: Verified



-- 
To view, visit https://gerrit.ovirt.org/39236
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I305de12cdaeac8c018fb5282b3bc0592a1252d20
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server