scale UP CPU and memory UI
scale UP CPU and memory UI
Removing ^M's from code.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Correcting missing license headers in two MidoNet plugin files

Signed-off-by: Chip Childers <chip.childers@gmail.com>
CLOUDSTACK-1669:UI for non-contiguous VLAN ranges
fix bunch of bugs related to zone wide storage
Remove db-enc.properties

This seemed to be used with Ant, but there is no other reference to this file.

It shouldn't be here and isn't used. It only confuses people.
maven: Do not copy the management server configuration to the webapp

All configuration should be in /etc/cloudstack/management
Revert "maven: Do not copy the management server configuration to the webapp"

This reverts commit a773ab16d6af5cd98245ddb14f0e065acfee48bd.

See devlist for reasoning
Fix for _pingTimeout being 0 in AgentMonitor

With commit d79f1f6fdc8307aa4038bfb2c7607904b89eedbe the AgentMonitor
was replaced with a pluggable service. However the ping timeout in the
original constructor was not passed on anymore, leading to a default
pingTimout of 0. This would fail all agents constantly.

Modified the startMonitor command to take a pingtimeout as an argument
and instruct AgentManagerImpl to pass it along.
CLOUDSTACK-1936 add cloudstack-agent as a service
CLOUDSTACK-1842: adding the missing os type in upgrade script

Signed-off-by: Chip Childers <chip.childers@gmail.com>
CLOUDSTACK-1589: Don't depend on chkconfig

Although this package is semi-available under Ubuntu/Debian we don't use it.

It's not used by the packages, so no reason to depend on it.
CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address
CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly
CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly, merge the fix with latest master changes
CLOUDSTACK-1917: Both MidoNet and NiciraNvp have a network guru that must be loaded
CLOUDSTACK-1874: Removed region_id column from cloud_usage db account table
Packaging: db-enc.properties is gone
Merge remote-tracking branch 'remotes/origin/scale-UP'