[SCM] CTDB repository - branch master updated - ded1a974cdd86b436c6e5cba27069d1a3796dbe9

[Ronnie Sahlberg]

The branch, master has been updated
       via  ded1a974cdd86b436c6e5cba27069d1a3796dbe9 (commit)
       via  795c190b004d404b84dda053593139ed51d345e5 (commit)
      from  b1fed105ad780e89a128a611ef0bd659818eeebf (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ded1a974cdd86b436c6e5cba27069d1a3796dbe9
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Jul 28 17:11:15 2008 +1000

    new version 1.0.51

commit 795c190b004d404b84dda053593139ed51d345e5
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Jul 28 17:07:44 2008 +1000

    From Alexander Saupp.
    If we use vlan tagging and bonding we must strip the vlan part off the name
    so we can check the main bonde device for status.
    
    I.e. check bond0  instead of bond0.<VLANTAG>

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/10.interface |    1 +
 packaging/RPM/ctdb.spec      |    9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index 8283a3f..15e5561 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -147,6 +147,7 @@ case $cmd in
 	for IFACE in $INTERFACES ; do
 	    case $IFACE in 
 	    bond*)
+		IFACE=`echo $IFACE |sed -e 's/\....$//'`
 		grep '^MII Status: up' /proc/net/bonding/$IFACE > /dev/null || {
 			echo "ERROR: public network interface $IFACE is down"
 			exit 1
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 1ac4129..bff072b 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: 50
+Release: 51
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -118,6 +118,13 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Mon Jul 28 2008 : Version 1.0.51
+ - Strip off the vlan tag from bond devices before we check in /proc
+   if the interface is up or not.
+ - Use testparm in the background in the scripts to allow probing
+   that the shares do exist.
+ - Fix a bug in the logging code to handle multiline entries better
+ - Rename private elements from private to private_data
 * Fri Jul 18 2008 : Version 1.0.50
  - Dont assume that just because we can establish a TCP connection
    that we are actually talking to a functioning ctdb daemon.


-- 
CTDB repository