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

..

apidoc

CLOUDSTACK-8592: Implement Quota service

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

appliance

changed the base iso file from debian-7.8.0 to debian-7.9.0

2015-09-15 21:37:44 +05:30

bugs-wiki

fixing license headers in marvin

2012-07-04 18:45:08 -04:00

build

Use version for RC branch name instead of branch

2015-11-30 22:21:04 +01:00

checkstyle

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

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

cli

tools: Remove cloudmonkey, add info in INSTALL.md

2013-07-28 22:53:12 +05:30

devcloud

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

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

devcloud4

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

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

devcloud-kvm

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

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

docker

squashed commit for dockerfiles part#2 including comments from PR#910

2015-10-28 22:34:31 -04:00

eclipse

CLOUDSTACK-8433: remove awsapi db usage and add upgrade cleanup path

2015-05-06 15:22:04 +02:00

git

Show actual diff in commits after merge

2015-12-12 11:22:32 +01:00

jira

jira-changes.py: generate content for CHANGES.md from jira filter

2014-11-30 21:16:59 -05:00

logo

Ho ho ho!

2014-12-01 22:44:20 +05:30

marvin

CLOUDSTACK-9135 - Makes possible to add multiple providers per service

2015-12-11 15:02:55 +01:00

ngui

CLOUDSTACK-9048: Fix typo for public network description

2015-11-09 11:18:44 -06:00

transifex

Update L10N resource files on master branch (with 4.6 translation strings from Transifex) Add new HU resource file for Hungarian translation

2015-05-09 08:37:53 +02:00

travis

Merge branch 'fixtravis3' of https://github.com/rsafonseca/cloudstack

2015-07-01 09:12:17 +02:00

utils/database_comparision_during_upgrade

database_comparision_during_upgrade: add missing license header

2015-04-27 11:55:41 +02:00

vagrant

Add missing license headers from recent branch merge 3c429ee

2015-03-18 11:03:54 +05:30

whisker

Adding httpclient ssl source files to legal documentation

2013-08-26 12:36:59 -04:00

wix-cloudstack-maven-plugin

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

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

pom.xml

Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

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