Eli Mesika has submitted this change and it was merged. Change subject: tools: Adds option MAIL_SMTP_ENCRYPTION to notifier ...................................................................... tools: Adds option MAIL_SMTP_ENCRYPTION to notifier Adds option MAIL_SMTP_ENCRYPTION to allow multiple types of SMTP encryption to be specified in notifier config. This new option also replaces old MAIL_ENABLE_SSL option. Change-Id: I4a914091060c0a86b2710ce20e666d67f28fa401 Bug-Url: https://bugzilla.redhat.com/1020920 Signed-off-by: Martin Perina <mperina@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/NotificationProperties.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/JavaMailSender.java M backend/manager/tools/src/test/java/org/ovirt/engine/core/notifier/utils/mail/MailSenderTest.java M backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf M backend/manager/tools/src/test/resources/conf/error-notifier.conf M backend/manager/tools/src/test/resources/conf/notifier-mail-test-plain.conf M backend/manager/tools/src/test/resources/conf/notifier-mail-test-secured.conf M backend/manager/tools/src/test/resources/conf/notifier-prop-test.conf M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf.in 9 files changed, 43 insertions(+), 10 deletions(-) Approvals: Eli Mesika: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/22296 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a914091060c0a86b2710ce20e666d67f28fa401 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com> Gerrit-Reviewer: mooli tayer <mtayer@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server