Changeset 8397 for branches/cu-security-branch/src/apps/admin/pvfs2-check-config.c

Timestamp:

06/18/10 20:02:50 (3 years ago)

Author:

nlmills

Message:

initial merge with Orange-Branch. much will be broken

Location:

branches/cu-security-branch

Files:

• . (modified) (1 prop)
• src/apps/admin (modified) (1 prop)
• src/apps/admin/pvfs2-check-config.c (modified) (1 diff)

branches/cu-security-branch

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

branches/cu-security-branch/src/apps/admin/pvfs2-check-config.c

@@ -129 +129 @@
         return -1;
     }
-    
+
     /* Construct the list of mount points */
     mnt = PVFS_util_parse_pvfstab(0);

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk