[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  171fdc2 ctdb-recovery: Fix newlines in log messages
      from  b71c2e4 Revert "ctdb-daemon: Check packet generation against database generation"

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 171fdc20b963c9e25a6aee3069365334d2e15b20
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Feb 9 16:49:58 2016 +1100

    ctdb-recovery: Fix newlines in log messages
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Tue Feb  9 22:28:08 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/ctdb_recovery_helper.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index 6d6a835..d7288e2 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -667,7 +667,7 @@ static void recover_db_name_done(struct tevent_req *subreq)
 	status = ctdb_client_control_recv(subreq, &ret, state, &reply);
 	TALLOC_FREE(subreq);
 	if (! status) {
-		LOG("control GET_DBNAME failed for db=0x%x\n, ret=%d",
+		LOG("control GET_DBNAME failed for db=0x%x, ret=%d\n",
 		    state->db_id, ret);
 		tevent_req_error(req, ret);
 		return;
@@ -675,7 +675,7 @@ static void recover_db_name_done(struct tevent_req *subreq)
 
 	ret = ctdb_reply_control_get_dbname(reply, state, &state->db_name);
 	if (ret != 0) {
-		LOG("control GET_DBNAME failed for db=0x%x\n, ret=%d\n",
+		LOG("control GET_DBNAME failed for db=0x%x, ret=%d\n",
 		    state->db_id, ret);
 		tevent_req_error(req, EPROTO);
 		return;
@@ -983,10 +983,10 @@ static void recover_db_transaction_committed(struct tevent_req *subreq)
 						       err_list, &pnn);
 		if (ret2 != 0) {
 			LOG("control DB_TRANSACTION_COMMIT failed for db %s"
-			    " on node %u, ret=%d", state->db_name, pnn, ret2);
+			    " on node %u, ret=%d\n", state->db_name, pnn, ret2);
 		} else {
-			LOG("control DB_TRANSACTION_COMMIT failed for db %s\n,"
-			    " ret=%d", state->db_name, ret);
+			LOG("control DB_TRANSACTION_COMMIT failed for db %s,"
+			    " ret=%d\n", state->db_name, ret);
 		}
 		tevent_req_error(req, ret);
 		return;


-- 
Samba Shared Repository