Updated Branches: refs/heads/vpc d51719ddc -> 14fa5279e
Merge branch 'master' into vpc Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/14fa5279 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/14fa5279 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/14fa5279 Branch: refs/heads/vpc Commit: 14fa5279e2fb6b0e51809465fe4eb01a1c86ce4f Parents: 519c492 2b2e491 Author: Alena Prokharchyk <[email protected]> Authored: Tue Jul 17 17:12:17 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Tue Jul 17 17:12:17 2012 -0700 ---------------------------------------------------------------------- build/developer.xml | 7 ++- .../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 2 +- client/tomcatconf/db-enc.properties.in | 54 +++++++++++++++ debian/cloud-daemonize.install | 2 - debian/cloud-deps.install | 2 +- debian/cloud-server.install | 16 ++++ debian/cloud-test.install | 6 -- debian/control | 19 ----- ui/scripts/ui/widgets/listView.js | 8 ++- wscript_configure | 7 +- 10 files changed, 87 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
