« Previous | Next » 

Revision 72435cd4

ID72435cd4536c9419792472cfe91aab446750115d
Parent fa466333, 91b37ed7
Child 3cf5d5e7, e28ad2a6

Added by Ruben S. Montero about 10 years ago

Merge branch 'feature-407' into feature-407rm

Conflicts:
include/Host.h
include/PoolObjectSQL.h
include/RequestManager.h
src/rm/RequestManager.cc
src/rm/RequestManagerUserAllocate.cc
src/rm/SConstruct

Files

  • added
  • modified
  • copied
  • renamed
  • deleted