« Previous | Next » 

Revision 8e8eed4c

ID8e8eed4c0d4aa8fdd552df984d676c57c1120c57
Parent 5f689eb2, c6422bc8
Child d683fbcd

Added by Carlos Martín almost 6 years ago

Merge remote-tracking branch 'origin/master' into feature-3654

Conflicts:
include/VirtualMachine.h
share/doc/xsd/acct.xsd
share/doc/xsd/vm.xsd
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
src/oca/ruby/opennebula/virtual_machine.rb
src/sunstone/public/js/opennebula.js
src/sunstone/public/js/plugins/vms-tab.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted