granicus.if.org Git - zfs/commit

]> granicus.if.org Git - zfs/commit

projects / zfs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 72d2035 45d1cae)

author	Brian Behlendorf <behlendorf1@llnl.gov>
	Tue, 18 Aug 2009 19:06:21 +0000 (12:06 -0700)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Tue, 18 Aug 2009 19:06:21 +0000 (12:06 -0700)
commit	c5b5d32d69a35d641dedeacf23e54db5421bc74c
tree	6c370a51a2f550a6add2646413620330391bf46c	tree \| snapshot
parent	72d2035ed34eed2f4ceddb4a93283e2edb97e870	commit \| diff
parent	45d1cae3b8c949ecc391dd7a5b81963b34c71c29	commit \| diff

Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

Conflicts:

module/zfs/vdev_raidz.c

13 files changed:

cmd/zdb/zdb.c	diff1 \|	diff2 \|	blob \| history
cmd/zfs/zfs_main.c	diff1 \|	diff2 \|	blob \| history
cmd/zpool/zpool_main.c	diff1 \|	diff2 \|	blob \| history
cmd/zpool/zpool_vdev.c	diff1 \|	diff2 \|	blob \| history
cmd/ztest/ztest.c	diff1 \|	diff2 \|	blob \| history
lib/libzfs/libzfs_dataset.c	diff1 \|	diff2 \|	blob \| history
lib/libzfs/libzfs_util.c	diff1 \|	diff2 \|	blob \| history
module/zfs/dmu.c	diff1 \|	diff2 \|	blob \| history
module/zfs/dsl_dataset.c	diff1 \|	diff2 \|	blob \| history
module/zfs/spa.c	diff1 \|	diff2 \|	blob \| history
module/zfs/spa_misc.c	diff1 \|	diff2 \|	blob \| history
module/zfs/vdev_label.c	diff1 \|	diff2 \|	blob \| history
module/zfs/vdev_raidz.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.