« Previous | Next » 

Revision 87e855ed

ID87e855ed9f60baddce866d5b70d5118f17f43ead
Parent 4e7d39f6, 7a91010a
Child 6c7bbe6d

Added by Ruben S. Montero over 9 years ago

Merge branch 'feature-863'

Conflicts:
src/rm/RequestManagerVirtualMachine.cc
src/sunstone/etc/sunstone-server.conf

Files

  • added
  • modified
  • copied
  • renamed
  • deleted