[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-13-g910deba

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  910debaa673319a193374ecc75048e3b8da7564d (commit)
       via  287054d93ce4136d2f3db783ce4b5d3af3d14726 (commit)
      from  232f9f40926573fe0f1fb1782280f693d37c38fe (commit)

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


- Log -----------------------------------------------------------------
commit 910debaa673319a193374ecc75048e3b8da7564d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jan 20 15:14:47 2010 +1100

    Version 1.0.112-3

commit 287054d93ce4136d2f3db783ce4b5d3af3d14726
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jan 20 10:35:02 2010 +1100

    source the nfs sysconfig file from the 61.nfstickles script

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

Summary of changes:
 config/events.d/61.nfstickle |    2 ++
 packaging/RPM/ctdb.spec.in   |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/61.nfstickle b/config/events.d/61.nfstickle
index b717e2a..14794fe 100755
--- a/config/events.d/61.nfstickle
+++ b/config/events.d/61.nfstickle
@@ -3,6 +3,8 @@
 
 . $CTDB_BASE/functions
 
+. /etc/sysconfig/nfs
+
 service_name="nfs"
 service_start="mkdir -p $CTDB_BASE/state/nfstickle;mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`;echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle"
 service_reconfigure=$service_start
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index c694168..30545c5 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 2
+Release: 3
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -123,6 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Wed Jan 20 2010 : Version 1.0.112-3
+ - Explicitely source the nfs sysconfig file from the 61.nfstickles script.
 * Wed Jan 13 2010 : Version 1.0.112-2
  - Incorrect use of dup2() could cause ctdb to spin eating 100% cpu.
 * Tue Jan 12 2010 : Version 1.0.112


-- 
CTDB repository