Revision f167578f
ID | f167578f6ed094a1f7534e0042b5c632fd83f70b |
Parent | 0af9a21e, 7c0841f7 |
Child | 3874271a |
Merge branch 'feature-863' of git.opennebula.org:one into feature-863
Conflicts:
src/vnm_mad/remotes/test/OpenNebulaNetwork_spec.rb
Files
- added
- modified
- copied
- renamed
- deleted