Persistent Networks documentation:Reviewed-By: Jessica Tomechak and Likitha Shetty
Docs: Fixed typo in nicira plugin guide
CLOUDSTACK-1272: Fix incorrect annotation for service offering id

Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
maven: Fix stray characted in client/pom.xml introduced in 4572bc06

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
rat: Fix license for file from recent ui-plugins merge

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Summary: Adjust systemvm.iso path for KVM, due to packaging changes

Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
converting from UserVm to UserVmJoinVO.
CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages
Summary: centos63/package.sh, slightly better version parsing

Description: current package.sh fails if user hasn't downloaded all maven poms
prior to running package.sh. Now we match for something that vaguely resembles
a cloudstack version.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360889840 -0700
CLOUDSTACK-1137: force reconnect to a disconnected host throws error.
LDAP front end UI development
CLOUDSTACK-672: Set VMware cluster max. limit based on HV version
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
LDAP UI front end complete
CLOUDSTACK-1207. UpdateNetwork API fails with NPE if the network offering is not being updated and is non-persistent.
CLOUDSTACK-1295 : Added usage unit tests
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db

Conflicts:
	setup/db/db/schema-40to410.sql
CLOUDSTACK-1066: Add building script to build appliance

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Make sure initial log messages go somewhere for agent and usage
maven pom: put apache cloudstack tools together in umbrella pom

minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.

$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>

OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config

will deploy the datacenter using the marvin.config property's value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-625: Correcting legal documentation for the require.js file
that was added for the UI plugin feature.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
Server side integration for LDAP Configuration