cluster: master - Merge branch 'master' of ssh://git.fedorahosted.org/git/cluster

Christine Caulfield chrissie@fedoraproject.org
Mon Jan 12 14:00:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=784076fe27082d72b403dc652ccbd0049f14b72c
Commit:        784076fe27082d72b403dc652ccbd0049f14b72c
Parent:        344e481f58616d97461166d524f56b6c9c0816b0 2310c8acb1669d159457cd57f17036823cd80000
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Mon Jan 12 13:58:05 2009 +0000
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Mon Jan 12 13:58:05 2009 +0000

Merge branch 'master' of ssh://git.fedorahosted.org/git/cluster


 Makefile                                           |   10 +-
 cman/Makefile                                      |    2 +-
 cman/cman_tool/Makefile                            |    4 +-
 cman/cman_tool/main.c                              |   99 +-
 cman/config/Makefile                               |   29 +
 cman/config/cman-preconfig.c                       | 1180 +++++++++++
 cman/config/cman.h                                 |   14 +
 cman/config/nodelist.h                             |   93 +
 cman/daemon/Makefile                               |   41 -
 cman/daemon/ais.c                                  |  343 ---
 cman/daemon/ais.h                                  |   13 -
 cman/daemon/barrier.c                              |  468 ----
 cman/daemon/barrier.h                              |    6 -
 cman/daemon/cman-preconfig.c                       | 1172 ----------
 cman/daemon/cman.h                                 |   15 -
 cman/daemon/cmanconfig.c                           |  297 ---
 cman/daemon/cmanconfig.h                           |    3 -
 cman/daemon/cnxman-private.h                       |  183 --
 cman/daemon/cnxman-socket.h                        |  275 ---
 cman/daemon/commands.c                             | 2232 --------------------
 cman/daemon/commands.h                             |   37 -
 cman/daemon/daemon.c                               |  539 -----
 cman/daemon/daemon.h                               |   12 -
 cman/daemon/list.h                                 |   97 -
 cman/daemon/logging.c                              |   25 -
 cman/daemon/logging.h                              |   17 -
 cman/daemon/nodelist.h                             |   93 -
 cman/init.d/cman.in                                |  113 +-
 cman/init.d/qdiskd.in                              |   59 +-
 cman/lib/Makefile                                  |   12 -
 cman/lib/libcman.c                                 | 1108 ----------
 cman/lib/libcman.h                                 |  423 ----
 cman/notifyd/Makefile                              |    2 +-
 cman/qdisk/Makefile                                |    2 +-
 cman/services/cman/include/corosync/ipc_cman.h     |   16 +
 cman/services/cman/lib/Makefile                    |    7 +
 cman/services/cman/lib/libcman.c                   |  444 ++++-
 cman/services/cman/lib/libcman.h                   |  423 ++++
 cman/services/cman/services/cman.c                 |   52 +-
 cman/services/quorum/include/corosync/cmanquorum.h |    2 +
 .../quorum/include/corosync/ipc_cmanquorum.h       |    3 +-
 cman/services/quorum/lib/Makefile                  |    2 +
 cman/services/quorum/lib/libcmanquorum.c           |    9 +-
 cman/services/quorum/services/cmanquorum.c         |   53 +-
 cman/services/quorum/test/testcmanquorum1.c        |    3 +-
 config/plugins/xml/config.c                        |    2 -
 config/tools/ldap/confdb2ldif.c                    |   20 +-
 configure                                          |    8 +-
 doc/COPYRIGHT                                      |  185 +--
 group/Makefile                                     |    2 +-
 group/daemon/Makefile                              |   35 -
 group/daemon/app.c                                 | 1842 ----------------
 group/daemon/cman.c                                |  206 --
 group/daemon/cpg.c                                 | 1072 ----------
 group/daemon/gd_internal.h                         |  323 ---
 group/daemon/groupd.h                              |   13 -
 group/daemon/joinleave.c                           |  165 --
 group/daemon/logging.c                             |   60 -
 group/daemon/main.c                                | 1082 ----------
 group/lib/Makefile                                 |   17 -
 group/lib/libgroup.c                               |  524 -----
 group/lib/libgroup.h                               |   81 -
 group/man/groupd.8                                 |   43 -
 group/test/Makefile                                |   16 -
 group/test/client.c                                |   45 -
 group/test/clientd.c                               |  179 --
 group/tool/Makefile                                |   21 +-
 group/tool/main.c                                  |  635 +------
 make/copyright.cf                                  |    2 +-
 make/install.mk                                    |    6 +
 make/libs.mk                                       |    6 +-
 make/uninstall.mk                                  |    3 +
 72 files changed, 2401 insertions(+), 14224 deletions(-)



More information about the Cluster-cvs mailing list