[Pkg-samba-maint] [ctdb] 02/10: Merge tag 'upstream/2.3+debian0' into debian-sid

Mathieu Parent sathieu at alioth.debian.org
Thu Aug 15 18:42:46 UTC 2013


This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch debian-sid
in repository ctdb.

commit bc023306e3666ea86d8ef8dfc220999408866cbc
Merge: 33a8774 b8de429
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Aug 10 19:22:12 2013 +0200

    Merge tag 'upstream/2.3+debian0' into debian-sid
    
    Upstream version 2.3+debian0

 Makefile.in                                  |  102 ++++---
 NEWS                                         |   70 +++++
 client/ctdb_client.c                         |   14 +-
 common/ctdb_io.c                             |    2 +-
 common/ctdb_logging.c                        |   15 +-
 common/ctdb_ltdb.c                           |    2 +-
 common/ctdb_message.c                        |    2 +-
 common/ctdb_util.c                           |   11 +-
 common/system_aix.c                          |    6 +
 common/system_common.c                       |    2 +-
 common/system_freebsd.c                      |    6 +
 common/system_gnu.c                          |    6 +
 common/system_kfreebsd.c                     |    6 +
 common/system_linux.c                        |   26 +-
 config/ctdb-crash-cleanup.sh                 |    2 +-
 config/ctdb.init                             |  389 ++++----------------------
 config/ctdb.service                          |   15 +
 config/ctdb.sysconfig                        |   19 ++
 config/ctdbd_wrapper                         |  275 ++++++++++++++++++
 config/debug_locks.sh                        |   45 +++
 config/events.d/00.ctdb                      |  113 +++++++-
 config/events.d/13.per_ip_routing            |    2 +-
 config/events.d/60.ganesha                   |  114 ++++----
 config/events.d/60.nfs                       |   25 ++
 config/functions                             |   40 ++-
 configure                                    |   18 +-
 doc/ctdb.1                                   |   86 +++++-
 doc/ctdb.1.html                              |  204 ++++++++------
 doc/ctdb.1.xml                               |   70 ++++-
 doc/ctdbd.1                                  |   20 +-
 doc/ctdbd.1.html                             |  187 ++++++-------
 doc/ctdbd.1.xml                              |   33 +--
 doc/ltdbtool.1                               |    4 +-
 doc/ltdbtool.1.html                          |   12 +-
 doc/onnode.1                                 |    4 +-
 doc/onnode.1.html                            |   16 +-
 doc/ping_pong.1                              |    4 +-
 doc/ping_pong.1.html                         |   10 +-
 doc/recovery-process.txt                     |    6 +-
 include/ctdb_private.h                       |   16 +-
 include/ctdb_protocol.h                      |    7 -
 include/ctdb_version.h                       |    2 +-
 lib/util/db_wrap.c                           |    2 +-
 libctdb/control.c                            |   33 +--
 libctdb/ctdb.c                               |    1 +
 packaging/RPM/ctdb.spec                      |   71 +++--
 packaging/RPM/ctdb.spec.in                   |   69 +++--
 server/ctdb_banning.c                        |   39 ++-
 server/ctdb_call.c                           |    3 +-
 server/ctdb_control.c                        |   32 ++-
 server/ctdb_daemon.c                         |   44 ++-
 server/ctdb_freeze.c                         |   34 +--
 server/ctdb_lock.c                           |  205 +++-----------
 server/ctdb_logging.c                        |   45 ++-
 server/ctdb_ltdb_server.c                    |   69 +----
 server/ctdb_monitor.c                        |   16 +-
 server/ctdb_persistent.c                     |    2 +-
 server/ctdb_recover.c                        |    7 +-
 server/ctdb_recoverd.c                       |  298 ++++++++++----------
 server/ctdb_server.c                         |    2 +-
 server/ctdb_takeover.c                       |   78 +++++-
 server/ctdb_traverse.c                       |   92 +++---
 server/ctdb_tunables.c                       |    1 -
 server/ctdb_update_record.c                  |    3 +-
 server/ctdb_vacuum.c                         |    4 +-
 server/eventscript.c                         |   21 +-
 tcp/tcp_connect.c                            |   13 +-
 tcp/tcp_init.c                               |    2 +-
 tcp/tcp_io.c                                 |    2 +-
 tests/eventscripts/00.ctdb.init.001.sh       |   13 +
 tests/eventscripts/00.ctdb.init.002.sh       |   17 ++
 tests/eventscripts/00.ctdb.init.003.sh       |   16 ++
 tests/eventscripts/00.ctdb.init.004.sh       |   22 ++
 tests/eventscripts/00.ctdb.init.005.sh       |   20 ++
 tests/eventscripts/00.ctdb.init.006.sh       |   25 ++
 tests/eventscripts/00.ctdb.init.007.sh       |   16 ++
 tests/eventscripts/00.ctdb.init.008.sh       |   19 ++
 tests/eventscripts/00.ctdb.init.021.sh       |   11 +
 tests/eventscripts/00.ctdb.init.022.sh       |   18 ++
 tests/eventscripts/00.ctdb.init.023.sh       |   23 ++
 tests/eventscripts/60.ganesha.monitor.101.sh |   11 +
 tests/eventscripts/60.ganesha.monitor.131.sh |   17 ++
 tests/eventscripts/60.ganesha.monitor.141.sh |   39 +++
 tests/eventscripts/60.nfs.monitor.102.sh     |   15 +
 tests/eventscripts/60.nfs.monitor.103.sh     |   15 +
 tests/eventscripts/60.nfs.monitor.104.sh     |   18 ++
 tests/eventscripts/60.nfs.monitor.113.sh     |   18 ++
 tests/eventscripts/60.nfs.monitor.114.sh     |   18 ++
 tests/eventscripts/etc-ctdb/rc.local         |    6 +
 tests/eventscripts/scripts/local.sh          |   53 +++-
 tests/eventscripts/stubs/date                |    7 +
 tests/eventscripts/stubs/ip                  |   25 +-
 tests/eventscripts/stubs/pidof               |   10 +
 tests/eventscripts/stubs/tdbdump             |    9 +
 tests/eventscripts/stubs/tdbtool             |   15 +
 tests/scripts/integration.bash               |   21 +-
 tests/src/ctdb_bench.c                       |    3 +
 tests/src/ctdb_fetch.c                       |    5 +
 tests/src/ctdb_fetch_readonly_loop.c         |    3 +
 tests/src/ctdb_trackingdb_test.c             |    3 +
 tests/src/ctdb_traverse.c                    |    3 +
 tests/src/ctdb_update_record.c               |    3 +
 tests/src/ctdb_update_record_persistent.c    |    5 +-
 tests/src/ctdbd_test.c                       |    2 +-
 tools/ctdb.c                                 |   56 ++--
 utils/nagios/check_ctdb                      |    6 +-
 utils/ping_pong/ping_pong.c                  |    4 +
 web/samba.html                               |   12 +-
 108 files changed, 2387 insertions(+), 1411 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/ctdb.git



More information about the Pkg-samba-maint mailing list