Changeset 8474

Show
Ignore:
Timestamp:
08/06/10 14:31:27 (3 years ago)
Author:
nlmills
Message:

merge with Orange-Branch

Location:
branches/cu-security-branch
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/cu-security-branch/configure

    r8397 r8474  
    13991399PVFS2_VERSION_MAJOR=2 
    14001400PVFS2_VERSION_MINOR=8 
    1401 PVFS2_VERSION_SUB=1 
     1401PVFS2_VERSION_SUB=2 
    14021402#PVFS2_PRE="" 
    1403 PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME" 
     1403PVFS2_VERSION_PRE="-orangefs-$CONFIGURE_TIME" 
    14041404 
    14051405PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB$PVFS2_VERSION_PRE 

  • branches/cu-security-branch/configure.in

    r8397 r8474  
    1919PVFS2_VERSION_MAJOR=2 
    2020PVFS2_VERSION_MINOR=8 
    21 PVFS2_VERSION_SUB=1 
     21PVFS2_VERSION_SUB=2 
    2222#PVFS2_PRE="" 
    23 PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME" 
     23PVFS2_VERSION_PRE="-orangefs-$CONFIGURE_TIME" 
    2424 
    2525PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB$PVFS2_VERSION_PRE