OpenNebula

Revision dec7a0d7

ID	dec7a0d79f498208fd8b684b951c67bc260dd619
Parent	ea98ae0b, 2969a60d
Child	cdf2981c

Added by Ruben S. Montero over 8 years ago

Merge branch 'bug-1561'

Conflicts:
src/lcm/LifeCycleStates.cc

Files

• added
• modified
• copied
• renamed
• deleted