Ruben S. Montero d2adccbc51 Merge branch 'bug-1123' ...

Conflicts:
	src/sunstone/models/SunstoneServer.rb

2012-02-17 12:30:35 +01:00

..

acct

bug #1080: acctd error when monitoring VMs with no history

2012-01-23 17:18:43 +01:00

acl

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

authm

Update core tests for 3.2

2012-01-19 09:42:12 -08:00

authm_mad

bug #1113: Default quota keys must be specified in uppecase

2012-02-09 17:42:26 +01:00

cli

bug #1130: Use period_to_str in onevm

2012-02-15 19:56:14 +01:00

cloud

Increase default image register polling in OCCI server to 5 secs

2012-02-15 00:32:37 +01:00

common

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

dm

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

group

Bug #1086: Core tests for cache bug

2012-01-26 17:02:06 +01:00

hm

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

hm_mad

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

host

Bug #1086: Core tests for cache bug

2012-01-26 17:02:06 +01:00

im

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

im_mad

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

image

Bug #1087: Core tests

2012-01-26 19:02:25 +01:00

image_mad

bug #1042: fix units for du size

2012-02-13 12:57:57 +01:00

lcm

Fix typo in error message

2012-02-13 15:26:50 +01:00

log

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

mad

bug #1064: close connection after action finishes (VMM)

2012-01-19 17:01:22 +01:00

nebula

Feature #1070: Make VM and IMG restricted attributes configurable in oned.conf

2012-01-23 08:18:12 -08:00

oca

bug #1017: Add Nokogiri XMLRPCParser

2012-01-20 16:15:56 +01:00

onedb

Add onedb migrator 3.2.1_to_3.3.0.rb

2012-02-09 18:14:22 +01:00

ozones

Bug #1085: Increase cookie expiration time in web-UIs.

2012-02-07 22:22:22 +01:00

pool

Merge branch 'feature-1095'

2012-02-08 07:22:04 -08:00

rm

Feature #1095: Templates in one.*.allocate, one.*.update & one.vn.add/rmleases can be in XML

2012-01-30 19:31:21 +01:00

scheduler

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

sql

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

sunstone

Merge branch 'bug-1123'

2012-02-17 12:30:35 +01:00

template

Better error message cleanup in Template::parse_str_or_xml

2012-02-08 17:10:07 +01:00

test

Fix core tests in master

2012-01-26 17:26:57 +01:00

tm

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

tm_mad

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

um

Bug #1086: Core tests for cache bug

2012-01-26 17:02:06 +01:00

vm

Fix core tests in master

2012-01-26 17:26:57 +01:00

vm_template

Bug #1087: Core tests

2012-01-26 19:02:25 +01:00

vmm

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

vmm_mad

feature #1048: Refactor one_vmm_ec2 and add suspend/reboot/resume support

2012-02-16 12:43:40 +01:00

vnm

Bug #1087: Core tests

2012-01-26 19:02:25 +01:00

vnm_mad

Bug #1046: Fix detection of hypervisor. A regular user can't read /proc/xen/capabilities

2012-01-12 18:34:52 +01:00

xml

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00