Carlos Martín 8e8eed4c0d 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

2015-03-23 12:08:36 +01:00

..

doc

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

2015-03-23 12:08:36 +01:00

etc

Feature #3601: Set Maximum Transmission Unit in 802.1q drivers

2015-03-20 17:43:05 +01:00

examples

Feature #2691: Remove oZones code

2014-01-29 15:56:20 +01:00

hooks

Change year to 2015

2015-02-24 12:27:59 +01:00

install_gems

Scientific linux is also supported

2015-02-06 16:25:05 +01:00

man

Bump version 4.12.0

2015-03-09 10:29:02 +01:00

pkgs

feature #301: add logrotate configuration

2015-03-13 14:26:52 +01:00

router

Change year to 2015

2015-02-24 12:27:59 +01:00

rubygems

Bump version 4.12.0

2015-03-09 10:29:02 +01:00

scons

Change year to 2015

2015-02-24 12:27:59 +01:00

scripts

Change year to 2015

2015-02-24 12:27:59 +01:00

sudoers

bug #3665: add ipset to the allowed list in sudoers files

2015-03-12 17:55:15 +01:00

vendor/ruby/gems/rbvmomi

feature #1977: Remove unneeded gem files

2013-05-20 17:52:16 +02:00

websockify

feature #2988: update websocketproxy to latest version

2014-06-18 12:37:25 +02:00