summaryrefslogtreecommitdiff
authorKern Sibbald <kern@sibbald.com>2013-04-20 13:16:25 (GMT)
committer Kern Sibbald <kern@sibbald.com>2013-04-20 13:16:25 (GMT)
commitd820cf413f410d94bd9102f859e4165793da2f22 (patch)
tree849ad5002c138da4c10dc6ec9d8ba91c34bca277
parente7dc3f2b1701b99c7a105b99d09614faaf652690 (diff)
Tweak updatesBranch-5.2
-rw-r--r--bacula/src/filed/job.c4
-rw-r--r--bacula/src/filed/status.c9
2 files changed, 0 insertions, 13 deletions
diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 230c626..328498c 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 1306a8b..93e1c72 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));