Ruben S. Montero b99d0c294a Merge branch 'feature-1678' ...

Conflicts:
	src/im_mad/remotes/common.d/collectd-client_control.sh
	src/onedb/4.2.0_to_4.3.80.rb

2013-10-25 21:23:27 +02:00

..

acl

Feature #1742: List resources from secondary groups

2013-08-23 15:36:43 +02:00

authm

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

authm_mad

feature #1916: bug in ldap auth

2013-04-30 13:01:16 +02:00

cli

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

cloud

Bump to version 4.3.80

2013-10-11 16:37:50 +02:00

cluster

feature #1712: Default DS selection code moved to Cluster class

2013-09-16 12:00:34 +02:00

common

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

datastore

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

datastore_mad

Feature #2393: Fix for empty CLONE_FSTYPE in vmfs clone (no -d left behind)

2013-10-25 17:50:59 +02:00

dm

Feature #2135: Allow VMs in unknown state to be shutdown

2013-08-28 17:02:56 +02:00

document

bug #1813: Storage type for BODY columns is now MEDIUMTEXT (this is only relevant for MySQL DBs)

2013-03-15 15:34:30 +01:00

flow

Bug #2266: Incompatible use of round method in earlier Ruby versions found in OneFlow component

2013-08-13 17:14:01 -04:00

group

Remove outdated core tests

2013-10-25 16:05:53 +02:00

hm

feature #1678: Exit oned if a driver cannot be loaded

2013-10-25 15:16:44 +02:00

hm_mad

Update copyright notice

2013-01-24 16:18:30 +01:00

host

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

im

feature #1678: Drop logic moved to Information Manager. Always drop the host

2013-10-25 21:11:20 +02:00

im_mad

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

image

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

lcm

Remove outdated core tests

2013-10-25 16:05:53 +02:00

log

feature #1766: SysLog support selectable at build time

2013-02-11 19:06:20 +01:00

mad

feature #2401: Set RUBYLIB environment with vendorized libs

2013-10-23 17:17:14 +02:00

nebula

feature #1678: Exit oned if a driver cannot be loaded

2013-10-25 15:16:44 +02:00

oca

Bump to version 4.3.80

2013-10-11 16:37:50 +02:00

onedb

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

onegate

feature #2054: Free encoded string in aes encryption. Move token path to history. Minor changes

2013-07-05 01:31:30 +02:00

ozones

Bump to version 4.3.80

2013-10-11 16:37:50 +02:00

pool

Remove outdated core tests

2013-10-25 16:05:53 +02:00

rm

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

scheduler

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

sql

Feature #1683: Simplify bootstrap methods

2013-10-08 15:14:12 +02:00

sunstone

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

template

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

tm

feature #1678: Exit oned if a driver cannot be loaded

2013-10-25 15:16:44 +02:00

tm_mad

Ceph should clone images in the target HOST, not in the BRIDGE_LIST

2013-09-19 18:31:56 +02:00

um

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

vm

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

vm_template

Remove outdated core tests

2013-10-25 16:05:53 +02:00

vmm

feature #1678: Exit oned if a driver cannot be loaded

2013-10-25 15:16:44 +02:00

vmm_mad

Merge branch 'feature-1678'

2013-10-25 21:23:27 +02:00

vnm

Remove outdated core tests

2013-10-25 16:05:53 +02:00

vnm_mad

Add standard paths to the commands executed in OpenNebulaNetwork.rb

2013-09-16 10:58:16 +02:00

xml

Remove outdated core tests

2013-10-25 16:05:53 +02:00