Revision 16ccfc63

« Previous | Next »

ID	16ccfc6323aa4d3853c50e0865b34126b33bc195
Parent	89c75c57
Child	f3332d01

Added by Javi Fontan over 12 years ago

Merged changes from trunk

git-svn-id: http://svn.opennebula.org/one/branches/one-1.2@301 3034c82b-c49b-4eb3-8279-a7acafdc01c0

Files

added
modified
copied
renamed
deleted

View differences

include
- Nebula.h (diff)
- NebulaTemplate.h (diff)
- VirtualMachine.h (diff)
install.sh (diff)
share
- etc
  - defaultrc (diff)
  - oned.conf (diff)
- examples
  - tm
    - tm_clone.sh (diff)
    - tm_delete.sh (diff)
    - tm_ln.sh (diff)
    - tm_mkimage.sh (diff)
    - tm_mkswap.sh (diff)
    - tm_mv.sh (diff)
- scripts
  - madcommon.sh (diff)
  - one (diff)
src
- client
  - ruby
    - one.rb (diff)
    - onehost (diff)
    - onevm (diff)
    - onevnet (diff)
- im_mad
  - ec2
    - one_im_ec2 (diff)
    - one_im_ec2.rb (diff)
  - im_ssh
    - one_im_ssh (diff)
    - one_im_ssh.rb (diff)
  - kvm
    - im_kvm.conf (diff)
    - kvm.rb (diff)
  - xen
    - im_xen.conf (diff)
- mad
  - Mad.cc (diff)
  - ruby
    - one_mad.rb (diff)
- nebula
  - Nebula.cc (diff)
  - NebulaTemplate.cc (diff)
  - oned.cc (diff)
- scheduler
  - Scheduler.cc (diff)
- template
  - Template.cc (diff)
- tm
  - TransferManagerDriver.cc (diff)
- tm_mad
  - TMScript.rb (diff)
  - dummy
    - tm_dummy.conf (diff)
  - nfs
    - tm_clone.sh (diff)
    - tm_delete.sh (diff)
    - tm_ln.sh (diff)
    - tm_mkimage.sh (diff)
    - tm_mkswap.sh (diff)
    - tm_mv.sh (diff)
    - tm_nfs.conf (diff)
  - one_tm (diff)
  - one_tm.rb (diff)
  - ssh
    - tm_clone.sh (diff)
    - tm_delete.sh (diff)
    - tm_ln.sh (diff)
    - tm_mkimage.sh (diff)
    - tm_mkswap.sh (diff)
    - tm_mv.sh (diff)
    - tm_ssh.conf (diff)
- vm
  - History.cc (diff)
  - VirtualMachine.cc (diff)
- vmm
- vmm_mad
  - ec2
    - one_vmm_ec2 (diff)
    - one_vmm_ec2.rb (diff)
    - vmm_ec2rc (diff)
  - kvm
    - one_vmm_kvm (diff)
    - one_vmm_kvm.rb (diff)
  - xen
    - one_vmm_xen (diff)
    - one_vmm_xen.rb (diff)