Remi Bergsma bdaa60fd6c Merge release branch 4.6 to master ...

* 4.6:
  Show actual diff in commits after merge
  CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStats

2015-12-12 14:03:43 +01:00

..

acl/static-role-based

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

affinity-group-processors

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

alert-handlers

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

2015-11-15 18:54:13 +01:00

api

Merge branch '4.6'

2015-12-07 12:44:07 +05:30

database

CLOUDSTACK-9131: Create a new API to check if the plugin is enabled.

2015-12-10 09:37:54 +05:30

dedicated-resources

Merge release branch 4.6 to master

2015-12-03 20:42:41 +01:00

deployment-planners

Removed PlannerBase empty class

2015-12-01 11:45:23 -02:00

event-bus

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

file-systems/netapp

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

ha-planners/skip-heurestics

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

host-allocators/random

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

hypervisors

Merge release branch 4.6 to master

2015-12-12 14:03:43 +01:00

network-elements

Merge release branch 4.6 to master

2015-12-07 21:36:36 +01:00

storage

CLOUDSTACK-9062: Improve S3 implementation.

2015-11-19 15:29:10 +01:00

storage-allocators/random

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

2015-11-21 18:31:11 -02:00

user-authenticators

Removal of DefaultUserAuthenticator empty class

2015-11-27 21:29:50 -02:00

pom.xml

CLOUDSTACK-8592: Implement Quota service

2015-12-07 23:02:48 +05:30