Rohit Yadav b6302d4e90 Merge remote-tracking branch 'origin/4.11' ...

Conflicts resolved for:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/vm/UserVmManagerImpl.java
tools/marvin/setup.py

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

2018-10-05 05:18:42 +05:30

..

apidoc

Remove 'iam' projects (#2817)

2018-09-11 13:06:20 -03:00

appliance

Merge remote-tracking branch 'origin/4.11'

2018-09-21 14:21:28 +05:30

bugs-wiki

fixing license headers in marvin

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

build

Remove 'iam' projects (#2817)

2018-09-11 13:06:20 -03:00

checkstyle

Cleanup POMs (#2613)

2018-07-25 14:39:37 -03:00

cli

README: Repo has moved (#2235)

2017-08-10 13:54:26 +02:00

devcloud4

Cleanup POMs (#2613)

2018-07-25 14:39:37 -03:00

devcloud-kvm

Cleanup POMs (#2613)

2018-07-25 14:39:37 -03:00

docker

maven: Updating pom.xml version numbers for release 4.11.2.0-SNAPSHOT (#2728)

2018-07-06 17:27:12 +05:30

eclipse

CLOUDSTACK-9859: Retirement of midonet plugin (final removal) (#2285)

2017-10-10 10:08:23 +05:30

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

README: happy holidays!

2015-12-23 13:27:40 +05:30

marvin

Merge remote-tracking branch 'origin/4.11'

2018-10-05 05:18:42 +05:30

ngui

CLOUDSTACK-9048: Fix typo for public network description

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

transifex

CLOUDSTACK-9621: Improve conversion Transifex's JSON format to CloudStack JS

2016-11-27 11:02:26 +00:00

travis

Fix Python code checkstyle execute by "systemvm\test\runtests.sh" (#2576)

2018-04-18 13:07:37 -03:00

utils/database_comparision_during_upgrade

database_comparision_during_upgrade: add missing license header

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

whisker

CLOUDSTACK-10105: Use maven standard project structure in all projects (#2283)

2018-01-20 03:19:27 +05:30

pom.xml

Cleanup POMs (#2613)

2018-07-25 14:39:37 -03:00