CVS commit: src/external/gpl2/lvm2/dist

[Adam Hamsik <haad%netbsd.org@localhost>]

Module Name:    src
Committed By:   haad
Date:           Wed Dec  2 00:58:03 UTC 2009

Modified Files:
        src/external/gpl2/lvm2/dist/include: dm-ioctl.h
        src/external/gpl2/lvm2/dist/lib/activate: fs.c
        src/external/gpl2/lvm2/dist/lib/commands: toolcontext.c
        src/external/gpl2/lvm2/dist/lib/device: dev-cache.c dev-io.c
        src/external/gpl2/lvm2/dist/lib/metadata: lv_manip.c
        src/external/gpl2/lvm2/dist/libdm: libdm-common.c libdm-deptree.c
        src/external/gpl2/lvm2/dist/man: Makefile.in fsadm.8
Added Files:
        src/external/gpl2/lvm2/dist/po: lvm2.po
Removed Files:
        src/external/gpl2/lvm2/dist/daemons/clogd: Makefile clogd.c cluster.c
            cluster.h common.h functions.c functions.h link_mon.c link_mon.h
            list.h local.c local.h logging.c logging.h
        src/external/gpl2/lvm2/dist/include: lvm2.h
        src/external/gpl2/lvm2/dist/lib: lvm2.h
        src/external/gpl2/lvm2/dist/tools: version.h.in

Log Message:
Fix cinflicts created by import of latest lvm2tools LVM2-2-02-56.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/lvm2/dist/daemons/clogd/Makefile \
    src/external/gpl2/lvm2/dist/daemons/clogd/clogd.c \
    src/external/gpl2/lvm2/dist/daemons/clogd/cluster.c \
    src/external/gpl2/lvm2/dist/daemons/clogd/cluster.h \
    src/external/gpl2/lvm2/dist/daemons/clogd/common.h \
    src/external/gpl2/lvm2/dist/daemons/clogd/functions.c \
    src/external/gpl2/lvm2/dist/daemons/clogd/functions.h \
    src/external/gpl2/lvm2/dist/daemons/clogd/link_mon.c \
    src/external/gpl2/lvm2/dist/daemons/clogd/link_mon.h \
    src/external/gpl2/lvm2/dist/daemons/clogd/list.h \
    src/external/gpl2/lvm2/dist/daemons/clogd/local.c \
    src/external/gpl2/lvm2/dist/daemons/clogd/local.h \
    src/external/gpl2/lvm2/dist/daemons/clogd/logging.c \
    src/external/gpl2/lvm2/dist/daemons/clogd/logging.h
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/dist/include/dm-ioctl.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/lvm2/dist/include/lvm2.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/lvm2/dist/lib/lvm2.h
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/dist/lib/activate/fs.c
cvs rdiff -u -r1.4 -r1.5 \
    src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/dist/lib/device/dev-cache.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/lvm2/dist/lib/device/dev-io.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/dist/lib/metadata/lv_manip.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/dist/libdm/libdm-common.c \
    src/external/gpl2/lvm2/dist/libdm/libdm-deptree.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/lvm2/dist/man/Makefile.in \
    src/external/gpl2/lvm2/dist/man/fsadm.8
cvs rdiff -u -r0 -r1.3 src/external/gpl2/lvm2/dist/po/lvm2.po
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/lvm2/dist/tools/version.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.