OpenNebula

Revision f736af49

ID	f736af49e469ade17858b8a8bd20c3f02331aa7b
Parent	0f1195e3, 5cf1b27e
Child	c03b7873

Added by Carlos Martín over 9 years ago

Merge branch 'feature-1095'

Conflicts:
src/pool/PoolObjectSQL.cc

Files

• added
• modified
• copied
• renamed
• deleted