From 78717f3f0a57f3174a176ac9319a1b2eb485e9c3 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 20 Apr 2013 15:16:25 +0200 Subject: [PATCH] Tweak updates --- bacula/src/filed/job.c | 4 ---- bacula/src/filed/status.c | 9 --------- 2 files changed, 13 deletions(-) diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 230c626a00..328498c6c3 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -1770,10 +1770,6 @@ static int storage_cmd(JCR *jcr) /* Try to connect for 1 hour at 10 second intervals */ sd->set_source_address(me->FDsrc_addr); -<<<<<<< HEAD -======= - ->>>>>>> caaa5db... Implement RestoreObject for sqlite + cleanups if (!sd->connect(jcr, 10, (int)me->SDConnectTimeout, me->heartbeat_interval, _("Storage daemon"), jcr->stored_addr, NULL, stored_port, 1)) { sd->destroy(); diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c index 1306a8bc64..93e1c72417 100644 --- a/bacula/src/filed/status.c +++ b/bacula/src/filed/status.c @@ -281,20 +281,11 @@ static void list_running_jobs_api(STATUS_PKT *sp) sec = 1; } bps = (int)(njcr->JobBytes / sec); -<<<<<<< HEAD - len = Mmsg(msg, " Files=%s\n Bytes=%s\n Bytes/sec=%s\n Errors=%d\n" - " Bwlimit=%d\n", - edit_uint64(njcr->JobFiles, b1), - edit_uint64(njcr->JobBytes, b2), - edit_uint64(bps, b3), - njcr->JobErrors, njcr->max_bandwidth); -======= len = Mmsg(msg, " Files=%s\n Bytes=%s\n Bytes/sec=%s\n Errors=%d\n", edit_uint64(njcr->JobFiles, b1), edit_uint64(njcr->JobBytes, b2), edit_uint64(bps, b3), njcr->JobErrors); ->>>>>>> caaa5db... Implement RestoreObject for sqlite + cleanups sendit(msg.c_str(), len, sp); len = Mmsg(msg, " Files Examined=%s\n", edit_uint64(njcr->num_files_examined, b1)); -- 2.39.2