Updated Branches: refs/heads/4.1 02bbb1082 -> c60643d53
Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c60643d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c60643d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c60643d5 Branch: refs/heads/4.1 Commit: c60643d535572ccaaa67daab90465314844f2c61 Parents: 859b13e 02bbb10 Author: Sebastien Goasguen <[email protected]> Authored: Tue Mar 5 09:37:58 2013 -0500 Committer: Sebastien Goasguen <[email protected]> Committed: Tue Mar 5 09:37:58 2013 -0500 ---------------------------------------------------------------------- .../vmware/manager/VmwareManagerImpl.java | 33 ++++++++------ .../api/query/dao/UserAccountJoinDaoImpl.java | 9 +--- 2 files changed, 21 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
