Carlos Martín 77aaa332a9 Merge remote-tracking branch 'origin/master' into feature-3175 ...

Conflicts:
	include/NebulaUtil.h
	install.sh
	src/common/NebulaUtil.cc
	src/onedb/local/4.9.80_to_4.11.80.rb
	src/sunstone/public/js/plugins/templates-tab.js
	src/sunstone/public/js/sunstone.js

2014-12-10 17:28:52 +01:00

..

doc

Update vnet xsd files

2014-08-06 16:45:44 +02:00

etc

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

2014-12-10 17:28:52 +01:00

examples

Feature #2691: Remove oZones code

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

hooks

bug #3153: bug in host_error hook reading config

2014-08-28 15:27:13 +02:00

install_gems

bug #3364: install zendesk_api gem compatible with 1.8.7

2014-11-18 14:52:07 +01:00

man

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

2014-12-10 17:28:52 +01:00

pkgs

bug #2866: add syslog dependency to opennebula daemon

2014-07-28 18:40:27 +02:00

router

Feature #3075: typo

2014-07-24 15:10:10 +02:00

rubygems

Add rbvmomi dependency to opennebula gem

2014-11-26 23:15:28 +01:00

scons

Bump to version 4.5.0

2014-01-09 11:51:20 +01:00

scripts

feature #3008: delete context packages from main repo

2014-07-02 19:06:58 +02:00

sudoers

Feature #2990: Remove vconfig from the sudoers files

2014-07-23 09:56:50 +02: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