Adding Travis badge on README.md
travis: remove the marvin flag require_hardware which is not needed for 4.3

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
developer: cheat with low acccount expunge interval for smoke tests

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
travis: for 4.3 just --load on nosetests to only use cfg and not deploy zone

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Fix for -SNAPSHOT problem in debian rules. Use -snapshot in the changelog to force the packaging to use the -SNAPSHOT extension for maven targets

(cherry picked from commit 2b47611c5d44893021016d2df9713c392cfa92df)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	debian/changelog
	debian/rules
CLOUDSTACK-6531: stopping the router in case of command failures. Also added alerts for failures.

Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 59bf3559196a9452a1a048849f4f9971753d373b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
strip leading spaces from path
(cherry picked from commit c1aa3a3f1aa99330ad95cc4fbc5e72d057a7ed8f)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Edit travis config and CHANGES file
simulator manager impl changes to handle SetMonitorServiceCommand This fixes some of the test cases in the integration test test_assign_vm.py when run against a simulator

Signed-off-by: Koushik Das <koushik@apache.org>

Conflicts:
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
Release: Fix typo in CHANGES file
Updating pom.xml version numbers for release 4.3.1

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
debian: fix version to 4.3.1 in debian log and console-proxy pom

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
Update CHANGES file with 7404 bug fix
pom: exclude CHANGES.md for license checking

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
appliance: fix build.sh for vmware systemvm building and exporting

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6624: set specifyIpRanges to true if specifyVlan is set to true

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Update CHANGES file with 6224
pom: fix xapi version from root pom.xml as 41c0eaa remove it from deps/XenServer

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
appliance: fix newer debian iso links and checksums for debian

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