From 3af56996544f343cd745170c3502b8b38a4d215c Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Fri, 21 Feb 2014 12:30:53 +0900
Subject: [PATCH 1/3] Fix minor typo in REST API accounts documentation

Change-Id: Icb9fc6ae948468860d9f0d5ac2fff110e183849a
---
 Documentation/rest-api-accounts.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index 70431c6954..1ac7d51e22 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -115,7 +115,7 @@ Set Account Name
 Sets the full name of an account.
 
 The new account name must be provided in the request body inside
-a link:#account-name-input[AccountNameInput] entity.
+an link:#account-name-input[AccountNameInput] entity.
 
 .Request
 ----

From d1f7ea03bf6aedf98065c81293d471ccb54174a0 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Fri, 21 Feb 2014 17:29:06 +0900
Subject: [PATCH 2/3] Update the revision of the cookbook plugin

To get the following changes:

- Add Gerrit-PluginName in the BUCK and Maven configs
- Add an example of plugin-owned capability
- Remove unnecessary exceptions from hello command class declaration

Change-Id: I2601b40367bba9e1ecd83adacd3193b9610055b0
---
 plugins/cookbook-plugin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/cookbook-plugin b/plugins/cookbook-plugin
index a42ccfbd7c..28235a6e75 160000
--- a/plugins/cookbook-plugin
+++ b/plugins/cookbook-plugin
@@ -1 +1 @@
-Subproject commit a42ccfbd7c71ffa36d30015d0da20f9e816a3691
+Subproject commit 28235a6e75d402b38ae29e1112a347e762ac3cbd

From 07b54729d0c7a1b842a208a05dccd009d0125232 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Mon, 24 Feb 2014 10:40:42 +0900
Subject: [PATCH 3/3] Comment Added stream event should be fired even if mail
 is not sent

If a reviewer adds a comment and unchecks the "and send email" option,
no email is sent, but the "comment-added" event is also not fired on
the events stream.

Fix it so the "comment-added" event is always sent, even if the "send
email" option is disabled.

Change-Id: I31cb740e99614585ce29b3a3bf4c6e2432db9c16
---
 .../gerrit/server/change/PostReview.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
index 367087c1b0..174a7b1673 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
@@ -193,14 +193,16 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
     } else {
       indexWrite = Futures.<Void, IOException> immediateCheckedFuture(null);
     }
-    if (input.notify.compareTo(NotifyHandling.NONE) > 0 && message != null) {
-      email.create(
-          input.notify,
-          change,
-          revision.getPatchSet(),
-          revision.getAccountId(),
-          message,
-          comments).sendAsync();
+    if (message != null) {
+      if (input.notify.compareTo(NotifyHandling.NONE) > 0) {
+        email.create(
+            input.notify,
+            change,
+            revision.getPatchSet(),
+            revision.getAccountId(),
+            message,
+            comments).sendAsync();
+      }
       fireCommentAddedHook(revision);
     }