Updated Branches:
refs/heads/autoscale [created] 34f43b27d
AutoScale. Adding default counters
Conflicts:
server/src/com/cloud/server/ConfigurationServerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-304to305.sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/34f43b27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/34f43b27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/34f43b27
Branch: refs/heads/autoscale
Commit: 34f43b27de5f409036c32f2ab269eb22a76d2b80
Parents: e245efe
Author: Vijay <[email protected]>
Authored: Wed Jul 25 18:01:00 2012 +0530
Committer: Vijay <[email protected]>
Committed: Thu Jul 26 22:22:04 2012 +0530
----------------------------------------------------------------------
.../com/cloud/server/ConfigurationServerImpl.java | 2415 ++++----
setup/db/create-schema.sql | 4589 ++++++++-------
2 files changed, 3505 insertions(+), 3499 deletions(-)
----------------------------------------------------------------------
