Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/019e0759 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/019e0759 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/019e0759 Branch: refs/heads/ui-restyle Commit: 019e075987a65ff0b14244f1a63fc57fca2c456b Parents: 63335cf 6e80bb0 Author: Brian Federle <[email protected]> Authored: Mon Oct 7 17:12:51 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Mon Oct 7 17:12:51 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/server/ResourceTag.java | 3 +- .../src/com/cloud/dc/dao/DcDetailsDao.java | 5 ++ .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 25 ++++++++- .../com/cloud/api/query/QueryManagerImpl.java | 37 ++++++++++++-- .../cloud/api/query/vo/StoragePoolJoinVO.java | 18 ++++--- .../metadata/ResourceMetaDataManagerImpl.java | 16 +++++- .../cloud/tags/TaggedResourceManagerImpl.java | 4 ++ setup/db/db/schema-420to430.sql | 54 ++++++++++++++++++++ ui/scripts/network.js | 6 ++- ui/scripts/ui-custom/granularSettings.js | 3 ++ usage/src/com/cloud/usage/UsageManagerImpl.java | 8 +-- 11 files changed, 160 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
