---
- branch: MAIN
  date: Wed Dec  2 00:58:03 UTC 2009
  files:
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/Makefile
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/Makefile@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/clogd.c
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/clogd.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/cluster.c
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/cluster.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/cluster.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/cluster.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/common.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/common.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/functions.c
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/functions.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/functions.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/functions.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/link_mon.c
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/link_mon.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/link_mon.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/link_mon.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/list.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/list.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/local.c
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/local.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/local.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/local.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/logging.c
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/logging.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/daemons/clogd/logging.h
    pathrev: src/external/gpl2/lvm2/dist/daemons/clogd/logging.h@0
    type: deleted
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl2/lvm2/dist/include/dm-ioctl.h
    pathrev: src/external/gpl2/lvm2/dist/include/dm-ioctl.h@1.4
    type: modified
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/include/lvm2.h
    pathrev: src/external/gpl2/lvm2/dist/include/lvm2.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/lib/lvm2.h
    pathrev: src/external/gpl2/lvm2/dist/lib/lvm2.h@0
    type: deleted
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl2/lvm2/dist/lib/activate/fs.c
    pathrev: src/external/gpl2/lvm2/dist/lib/activate/fs.c@1.4
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
    pathrev: src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c@1.5
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl2/lvm2/dist/lib/device/dev-cache.c
    pathrev: src/external/gpl2/lvm2/dist/lib/device/dev-cache.c@1.4
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/external/gpl2/lvm2/dist/lib/device/dev-io.c
    pathrev: src/external/gpl2/lvm2/dist/lib/device/dev-io.c@1.5
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl2/lvm2/dist/lib/metadata/lv_manip.c
    pathrev: src/external/gpl2/lvm2/dist/lib/metadata/lv_manip.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl2/lvm2/dist/libdm/libdm-common.c
    pathrev: src/external/gpl2/lvm2/dist/libdm/libdm-common.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/external/gpl2/lvm2/dist/libdm/libdm-deptree.c
    pathrev: src/external/gpl2/lvm2/dist/libdm/libdm-deptree.c@1.4
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/lvm2/dist/man/Makefile.in
    pathrev: src/external/gpl2/lvm2/dist/man/Makefile.in@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/gpl2/lvm2/dist/man/fsadm.8
    pathrev: src/external/gpl2/lvm2/dist/man/fsadm.8@1.3
    type: modified
  - new: '1.3'
    old: '0'
    path: src/external/gpl2/lvm2/dist/po/lvm2.po
    pathrev: src/external/gpl2/lvm2/dist/po/lvm2.po@1.3
    type: added
  - new: '0'
    old: 1.1.1.1
    path: src/external/gpl2/lvm2/dist/tools/version.h.in
    pathrev: src/external/gpl2/lvm2/dist/tools/version.h.in@0
    type: deleted
  id: 20091202T005803Z.9a3790e607e6b7dfb70eb72f21c78e97be58a167
  log: |
    Fix cinflicts created by import of latest lvm2tools LVM2-2-02-56.
  module: src
  subject: 'CVS commit: src/external/gpl2/lvm2/dist'
  unixtime: '1259715483'
  user: haad