svn merge -r19331:19335 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

@@ -36,6 +36,8 @@ documents those changes that are of interest to users and admins.
     rebuild unnecessarily (revert from libpmi.so.21.0.0 to libpmi.so.0.0.0).
  -- Restore support for a pending job's constraints (required node features) 
     when slurmctld is restarted (internal structure needed to be rebuilt).
+ -- Removed checkpoint_blcr.so from the plugin rpm in the slurm.spec since
+    it is also in the blcr rpm.
 
 * Changes in SLURM 2.1.1
 =============================

slurm.spec

@@ -455,8 +455,6 @@ test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/jobcomp_pgsql.so            &&
    echo %{_libdir}/slurm/jobcomp_pgsql.so            >> $LIST
 
 LIST=./plugins.files
-test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/checkpoint_blcr.so          &&
-   echo %{_libdir}/slurm/checkpoint_blcr.so          >> $LIST
 test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/crypto_openssl.so           &&
    echo %{_libdir}/slurm/crypto_openssl.so           >> $LIST
 test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/task_affinity.so            &&