Merge branch 'sigar-1.6'

Conflicts:

	bindings/java/version.properties
This commit is contained in:
Doug MacEachern 2009-02-08 18:15:26 -08:00
commit 8edff557f0
1 changed files with 5 additions and 0 deletions

View File

@ -447,6 +447,11 @@ static int sigar_common_fs_type_get(sigar_file_system_t *fsp)
fsp->type = SIGAR_FSTYPE_LOCAL_DISK;
}
break;
case 'z':
if (strEQ(type, "zfs")) {
fsp->type = SIGAR_FSTYPE_LOCAL_DISK;
}
break;
}
return fsp->type;