Merge branch 'master' into ui-add-remove-nics
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9db639c5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9db639c5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9db639c5 Branch: refs/heads/internallb Commit: 9db639c5ae17c9013fd5f9e0f8d371f5b9e51ace Parents: 86a9f27 a20ed3a Author: Brian Federle <[email protected]> Authored: Fri Apr 26 15:23:32 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri Apr 26 15:23:32 2013 -0700 ---------------------------------------------------------------------- .../api/command/user/zone/ListZonesByCmd.java | 9 +++++---- .../src/com/cloud/api/query/QueryManagerImpl.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
