[SCM] CTDB repository - branch master updated -
fb7f69b1d6dd8b0715258dde736dc03e1c5e43aa
Andrew Tridgell
tridge at samba.org
Mon Aug 11 13:34:47 GMT 2008
The branch, master has been updated
via fb7f69b1d6dd8b0715258dde736dc03e1c5e43aa (commit)
via 96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6 (commit)
via c94b295b078dc009c18aa416d0de232a12241014 (commit)
via 29aaa339ef745208fb0b746db5cbc3a32d0d81b2 (commit)
from db6bc3745a56cc12e60e727190a098a6527690d6 (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fb7f69b1d6dd8b0715258dde736dc03e1c5e43aa
Merge: 96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6 c94b295b078dc009c18aa416d0de232a12241014
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Aug 11 23:33:46 2008 +1000
Merge commit 'ronnie/master'
commit 96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Aug 11 23:33:05 2008 +1000
fixed a memory leak in the recovery daemon
thanks to vl for spotting this
commit c94b295b078dc009c18aa416d0de232a12241014
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Aug 11 10:36:38 2008 +1000
fix the date soe rpmbuild works
commit 29aaa339ef745208fb0b746db5cbc3a32d0d81b2
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Aug 11 10:33:22 2008 +1000
new version 1.0.55
-----------------------------------------------------------------------
Summary of changes:
packaging/RPM/ctdb.spec | 4 +++-
server/ctdb_recoverd.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index ea9ffbd..cb5cd6a 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: ctdb
Version: 1.0
-Release: 54
+Release: 55
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -118,6 +118,8 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Mon Aug 11 2008 : Version 1.0.55
+ - Fix the releaseip message we seond to samba.
* Fri Aug 8 2008 : Version 1.0.54
- fix a looping error in the transaction code
- provide a more detailed error code for persistent store errors
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 3295229..c503aa5 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -2153,7 +2153,7 @@ static int verify_ip_allocation(struct ctdb_context *ctdb, uint32_t pnn)
struct ctdb_uptime *uptime2 = NULL;
int ret, j;
- ret = ctdb_ctrl_uptime(ctdb, ctdb, CONTROL_TIMEOUT(),
+ ret = ctdb_ctrl_uptime(ctdb, mem_ctx, CONTROL_TIMEOUT(),
CTDB_CURRENT_NODE, &uptime1);
if (ret != 0) {
DEBUG(DEBUG_ERR, ("Unable to get uptime from local node %u\n", pnn));
@@ -2169,7 +2169,7 @@ static int verify_ip_allocation(struct ctdb_context *ctdb, uint32_t pnn)
return -1;
}
- ret = ctdb_ctrl_uptime(ctdb, ctdb, CONTROL_TIMEOUT(),
+ ret = ctdb_ctrl_uptime(ctdb, mem_ctx, CONTROL_TIMEOUT(),
CTDB_CURRENT_NODE, &uptime2);
if (ret != 0) {
DEBUG(DEBUG_ERR, ("Unable to get uptime from local node %u\n", pnn));
--
CTDB repository
More information about the samba-cvs
mailing list