Commit Graph

2093 Commits

Author SHA1 Message Date
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 7553978911 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-20 15:39:16 -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 72a988b98c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-20 14:18:31 -08:00
Brian Behlendorf 5ae334d138 Use .sh extension 2009-01-20 14:15:05 -08:00
Brian Behlendorf b5e0de7550 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-20 14:14:03 -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 9c0473f8a7 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-16 14:56:02 -08:00
Brian Behlendorf 5bf49743a6 Add minor root check for convenience 2009-01-16 14:51:52 -08:00
Brian Behlendorf 6f13e11df6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-16 14:33:08 -08:00
Brian Behlendorf 6a6da5a14d Minor verbage cleanup 2009-01-16 14:29:31 -08:00
Brian Behlendorf 2c988f7bbe Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-16 14:00:40 -08:00
Brian Behlendorf 7b5ceef9df Minor fixes 2009-01-16 13:57:12 -08:00
Brian Behlendorf 7b8bbcc885 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-16 13:29:10 -08:00
Brian Behlendorf 89ed048230 Minor script updates almost ready to test 2009-01-16 13:25:47 -08:00
Brian Behlendorf e55b63e70a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-16 12:57:29 -08:00
Brian Behlendorf 7c761d45a8 Further work towards getting zpool-create working 2009-01-16 12:53:12 -08:00
Brian Behlendorf 6c1a4d3d98 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-16 12:13:17 -08:00
Brian Behlendorf b38eb997f4 Update helper scripts to me more helpful 2009-01-16 12:06:25 -08:00
Brian Behlendorf 48eacbc326 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 16:45:03 -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 4fcc576d1c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 16:34:38 -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
Brian Behlendorf 68be1291b7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-15 16:30:26 -08:00
Brian Behlendorf 31cddc8a0b Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-15 16:30:25 -08:00
Brian Behlendorf 50186c2b57 All init and destroy initialized pulled in 2009-01-15 16:25:25 -08:00
Brian Behlendorf 7d4fe54632 txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions 2009-01-15 16:22:23 -08:00
Brian Behlendorf 58d8407826 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 15:56:20 -08:00
Brian Behlendorf 85c77e1c82 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:54:35 -08:00
Brian Behlendorf ee7f10a6b3 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 15:54:34 -08:00
Brian Behlendorf 38c24b7107 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-15 15:54:33 -08:00
Brian Behlendorf bd01208d25 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-01-15 15:54:33 -08:00
Brian Behlendorf cf9a5530e1 Fix pthreads prototype 2009-01-15 15:52:12 -08:00
Brian Behlendorf 382dd22f6b Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 15:42:20 -08:00
Brian Behlendorf 0197f3a298 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 975c613269 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 61ec157623 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-15 15:40:38 -08:00
Brian Behlendorf 51730cdeae Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:40:37 -08:00
Brian Behlendorf 37a3478d58 Resolve C90 int declared in for() construct 2009-01-15 15:38:26 -08:00