[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.47-2-g201c092

[Amitay Isaacs]

The branch, 1.2.40 has been updated
       via  201c092dbb38746847fb9e6bfef8ea068133e47c (commit)
       via  72074025a4d530c928f8b7504734fa56fefcc820 (commit)
      from  55b243a0387b8b0e58615f3b87afaa000189ade9 (commit)

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


- Log -----------------------------------------------------------------
commit 201c092dbb38746847fb9e6bfef8ea068133e47c
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Aug 9 19:47:08 2012 +1000

    New version 1.2.48
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 72074025a4d530c928f8b7504734fa56fefcc820
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Jun 28 14:54:33 2011 +1000

    Eventscripts: new functions set_proc() and get_proc().
    
    These provide a thin layer around writing and reading files in /proc.
    They can be easily replaced by stubs for unit testing.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 config/functions           |   18 ++++++++++++++++++
 packaging/RPM/ctdb.spec.in |    4 +++-
 2 files changed, 21 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/functions b/config/functions
index 4b18129..4d82801 100755
--- a/config/functions
+++ b/config/functions
@@ -160,6 +160,24 @@ ctdb_wait_tcp_ports() {
 
 
 ######################################################
+# wrapper around /proc/ settings to allow them to be hooked
+# for testing
+# 1st arg is relative path under /proc/, 2nd arg is value to set
+set_proc ()
+{
+    echo "$2" >"/proc/$1"
+}
+
+######################################################
+# wrapper around getting file contents from /proc/ to allow
+# this to be hooked for testing
+# 1st arg is relative path under /proc/
+get_proc ()
+{
+    cat "/proc/$1"
+}
+
+######################################################
 # check that a rpc server is registered with portmap
 # and responding to requests
 # usage: ctdb_check_rpc SERVICE_NAME PROGNUM VERSION
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 39e14c7..a7d95ad 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
 Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
-Version: 1.2.47
+Version: 1.2.48
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -144,6 +144,8 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Thu Aug 08 2012 : Version 1.2.48
+ - Fix missing set_proc() in policy routing
 * Thu Aug 08 2012 : Version 1.2.47
  - Add reconfigure event for policy routing
 * Tue Jul 24 2012 : Version 1.2.46


-- 
CTDB repository