Tweak updates

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 230c626a00d3999863c4f7bb1e55c7fd98debc47..328498c6c328755a6305b63083335785282e2a0f 100644 (file)
--- 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 1306a8bc648f257658fb3cbd46b0ecd96380fd3f..93e1c7241747320f7a7277139c8ab4e6e4e00957 100644 (file)
--- 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));