• Klaus Aehlig's avatar
    Merge branch 'stable-2.13' into stable-2.14 · 149a35b1
    Klaus Aehlig authored
    * stable-2.13
      Increase waiting time to avoid races
      Avoid watcher interaction in TestFilterRateLimit
      Avoid races in TestAdHocReasonRateLimit
      Avoid races in TestFilterRateLimit
    
    * stable-2.12
      Add a unit test for the Gluster storage type
      Add missing Gluster storage verification checks
      Add Gluster type to the node storage reporting set
      Introduce the Gluster storage type
      Make xend-config.sxp optional
      Revision bump to 2.12.4
      Update NEWS for 2.12.4
      Ignore *.dyn* files generated by GHC 7.8
      Replace HFLAGS_NOPROF with HFLAGS_DYNAMIC in the Makefile
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Check for gnt-cluster before running gnt-cluster upgrade
    
    Conflicts:
    	Makefile.am: take stable-2.14 version
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    149a35b1
.gitignore 2.9 KB