Commit Graph

2010 Commits

Author SHA1 Message Date
Brian Behlendorf 26a4bbe307 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-20 15:46:04 -08:00
Brian Behlendorf 60113ab6a4 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-20 15:46:04 -08:00
Brian Behlendorf aff9866d5f Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-01-20 15:46:03 -08:00
Brian Behlendorf 028529e666 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-01-20 15:46:03 -08:00
Brian Behlendorf e1a99937d8 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-01-20 15:46:01 -08:00
Brian Behlendorf 2bb5f3c8a2 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-01-20 15:46:01 -08:00
Brian Behlendorf 1aaa8e6c00 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-20 15:45:59 -08:00
Brian Behlendorf 6ce0cb1682 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-01-20 15:45:59 -08:00
Brian Behlendorf 385d850abb Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-01-20 15:45:58 -08:00
Brian Behlendorf 556844cd6e Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-01-20 15:45:57 -08:00
Brian Behlendorf 8241771029 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-20 15:45:56 -08:00
Brian Behlendorf 7fcb1853a4 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-20 15:45:55 -08:00
Brian Behlendorf f42bb765e7 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-01-20 15:45:54 -08:00
Brian Behlendorf cd185f1ce3 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-01-20 15:45:54 -08:00
Brian Behlendorf 00fafb5c53 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-01-20 15:45:52 -08:00
Brian Behlendorf 628fa75ed8 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-01-20 15:45:52 -08:00
Brian Behlendorf 1294061f7d Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-01-20 15:45:50 -08:00
Brian Behlendorf 6a89150864 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-01-20 15:45:50 -08:00
Brian Behlendorf 25a9c48ccc Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-20 15:45:49 -08:00
Brian Behlendorf 41b62d6b5d Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-20 15:45:48 -08:00
Brian Behlendorf 022d01e0d4 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-20 15:45:47 -08:00
Brian Behlendorf 87718a9290 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-20 15:45:46 -08:00
Brian Behlendorf 4710ede86a Add GIT to master 2009-01-20 15:43:44 -08:00
Brian Behlendorf 26d0de9a92 Update Makefiles for recent script updates 2009-01-20 15:43:21 -08:00
Brian Behlendorf 2cd4129a46 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-20 15:39:01 -08:00
Brian Behlendorf 8e976f7fcf Moving GIT to master for easier reference 2009-01-20 15:35:40 -08:00
Brian Behlendorf af43246767 Minor script cleanup 2009-01-20 15:34:38 -08:00
Brian Behlendorf 10bef218eb Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-20 14:18:16 -08:00
Brian Behlendorf 5ae334d138 Use .sh extension 2009-01-20 14:15:05 -08:00
Brian Behlendorf c7d27ee936 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-20 14:13:49 -08:00
Brian Behlendorf db210bf236 Add destroy functionality to zpool create, needed for generic use by zpios.sh 2009-01-20 14:10:30 -08:00
Brian Behlendorf def2d70ec2 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-16 14:55:48 -08:00
Brian Behlendorf 5bf49743a6 Add minor root check for convenience 2009-01-16 14:51:52 -08:00
Brian Behlendorf 4edd7cdf82 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-16 14:32:54 -08:00
Brian Behlendorf 6a6da5a14d Minor verbage cleanup 2009-01-16 14:29:31 -08:00
Brian Behlendorf 13a52fcd1b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-16 14:00:26 -08:00
Brian Behlendorf 7b5ceef9df Minor fixes 2009-01-16 13:57:12 -08:00
Brian Behlendorf 70f5cb46c6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-16 13:28:56 -08:00
Brian Behlendorf 89ed048230 Minor script updates almost ready to test 2009-01-16 13:25:47 -08:00
Brian Behlendorf d085105d7f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-16 12:57:15 -08:00
Brian Behlendorf 7c761d45a8 Further work towards getting zpool-create working 2009-01-16 12:53:12 -08:00
Brian Behlendorf 826f9dcba9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-16 12:12:52 -08:00
Brian Behlendorf b38eb997f4 Update helper scripts to me more helpful 2009-01-16 12:06:25 -08:00
Brian Behlendorf 8d392afc3d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 16:44:29 -08:00
Brian Behlendorf 2f2120f885 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:41:09 -08:00
Brian Behlendorf 498800d66a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:41:07 -08:00
Brian Behlendorf e9a0807176 Remove fix-locks dependency this topic branch was accepted upstream and can now be removed 2009-01-15 16:36:11 -08:00
Brian Behlendorf 48e716093d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 16:33:59 -08:00
Brian Behlendorf fb256294c9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:30:29 -08:00
Brian Behlendorf c5b335f613 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:30:28 -08:00