From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

---
 src/main/java/com/gitblit/manager/INotificationManager.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java
index 6bee2f8..64fc01e 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -22,10 +22,19 @@
 public interface INotificationManager extends IManager {
 
 	/**
+	 * Returns true if the email service is configured and ready to send notifications.
+	 *
+	 * @return true if the email service is operational
+	 * @since 1.6.0
+	 */
+	boolean isSendingMail();
+
+	/**
 	 * Notify the administrators by email.
 	 *
 	 * @param subject
 	 * @param message
+ 	 * @since 1.4.0
 	 */
 	void sendMailToAdministrators(String subject, String message);
 
@@ -35,6 +44,7 @@
 	 * @param subject
 	 * @param message
 	 * @param toAddresses
+ 	 * @since 1.4.0
 	 */
 	void sendMail(String subject, String message, Collection<String> toAddresses);
 
@@ -44,6 +54,7 @@
 	 * @param subject
 	 * @param message
 	 * @param toAddresses
+ 	 * @since 1.4.0
 	 */
 	void sendHtmlMail(String subject, String message, Collection<String> toAddresses);
 
@@ -52,6 +63,7 @@
 	 *
 	 * @param mailing
 	 * @return the mail message object
+ 	 * @since 1.4.0
 	 */
 	void send(Mailing mailing);
 

--
Gitblit v1.9.1