Updated Branches: refs/heads/master 55c67092d -> 8643e2c9a
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8643e2c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8643e2c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8643e2c9 Branch: refs/heads/master Commit: 8643e2c9ac84d548f4f152fa0148c69626afcb91 Parents: 5bb395e 55c6709 Author: olivier lamy <[email protected]> Authored: Wed Aug 29 00:09:13 2012 +0200 Committer: olivier lamy <[email protected]> Committed: Wed Aug 29 00:09:13 2012 +0200 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 4 ++-- ui/scripts/ui/widgets/tagger.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
