[SCM] CTDB repository - branch master updated -
de559946b20cfd7560a205b9c4ae73688341d1b5
Andrew Tridgell
tridge at samba.org
Tue May 5 11:36:18 GMT 2009
The branch, master has been updated
via de559946b20cfd7560a205b9c4ae73688341d1b5 (commit)
from ba1f6c310d41c97fdef60ddbad60aece869cabc2 (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit de559946b20cfd7560a205b9c4ae73688341d1b5
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue May 5 21:35:52 2009 +1000
removed merge fluff
-----------------------------------------------------------------------
Summary of changes:
packaging/RPM/ctdb.spec | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index ac4f908..6c628c3 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -131,7 +131,6 @@ fi
%{_libdir}/pkgconfig/ctdb.pc
%changelog
-<<<<<<< HEAD:packaging/RPM/ctdb.spec
* Tue May 5 2009 : Version 1.0.69-6
- Try to add back the routes in 99.routing both for the takeip and also the
releaseip event since during releaseip) too many addresses may have been
--
CTDB repository
More information about the samba-cvs
mailing list