← Back to branch summary

~yofel/ubuntu/quantal/btrfs-tools/merge-894456

~yofel/ubuntu/quantal/btrfs-tools/merge-894456

Viewing all changes in revision 29.

Committer: Dmitrijs Ledkovs
Date: 2012-05-21 10:33:35 UTC
mfrom: (1.1.8 upstream)
Revision ID: dmitrijs.ledkovs@canonical.com-20120521103335-627k6e5oofbko74e

Merging shared upstream rev into target branch.

files added:
btrfs-corrupt-block.c

btrfs-select-super.c

btrfs-zero-log.c

btrfslabel.c

btrfslabel.h

calc-size.c

cmds-balance.c

cmds-device.c

cmds-filesystem.c

cmds-inspect.c

cmds-scrub.c

cmds-subvolume.c

commands.h

common.c

find-root.c

help.c

man

man/Makefile

man/btrfs-image.8.in

man/btrfs-show.8.in

man/btrfsck.8.in

man/btrfsctl.8.in

man/mkfs.btrfs.8.in

repair.c

repair.h

restore.c

files removed:
.hgignore

.hgtags

btrfs_cmds.c

btrfs_cmds.h

man

man/Makefile

man/btrfs-image.8.in

man/btrfs-show.8.in

man/btrfsck.8.in

man/btrfsctl.8.in

man/mkfs.btrfs.8.in

files renamed:
man/btrfs.8.in => man/btrfs.8.in

files modified:
INSTALL

Makefile

bcp

btrfs-list.c

btrfs-map-logical.c

btrfs-show.c

btrfs-vol.c

btrfs.c

btrfsck.c

btrfsctl.c

convert.c

ctree.c

ctree.h

debug-tree.c

dir-item.c

disk-io.c

disk-io.h

extent-cache.c

extent-tree.c

extent_io.c

file-item.c

ioctl-test.c

ioctl.h

kerncompat.h

mkfs.c

print-tree.c

utils.c

utils.h

volumes.c

volumes.h

Show diffs side-by-side

added added

removed removed

btrfs-corrupt-block.c

btrfs-map-logical.c

btrfs-select-super.c

btrfs-zero-log.c

cmds-filesystem.c

cmds-subvolume.c

man/btrfs-image.8.in

man/btrfs-image.8.in

man/btrfs-show.8.in

man/btrfs-show.8.in

man/btrfsck.8.in

man/btrfsck.8.in

man/btrfsctl.8.in

man/btrfsctl.8.in

man/mkfs.btrfs.8.in

man/mkfs.btrfs.8.in

Older »