Revision e9b2b580
| ID | e9b2b5804e621d3e0f0015ab3da313dc05eca821 |
| Parent | f5ad01b5, 6e59fb94 |
| Child | 17ad2416 |
Merge branch 'feature-661'
Conflicts:
install.sh
src/cli/client_utilities.rb
src/cli/onegroup
src/cli/onehost
src/cli/oneimage
src/cli/onetemplate
src/cli/oneuser
src/cli/onevm
src/cli/onevnet
src/oca/ruby/OpenNebula/VirtualNetwork.rb
src/onedb/1.rb
Files
- added
- modified
- copied
- renamed
- deleted