« Previous | Next » 

Revision 7285fbd5

ID7285fbd5c0bd3ea452815d3d7f655a2f0c1ddfc6
Parent 6230001c, 96a7dc0d
Child 3db7376b

Added by Carlos Martín over 9 years ago

Merge branch 'feature-407' of git.opennebula.org:one into feature-407

Conflicts:
include/Group.h
include/User.h
src/cluster/Cluster.cc
src/cluster/ClusterPool.cc
src/group/Group.cc
src/rm/RequestManagerUserAllocate.cc
src/um/User.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted