Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9eae5f69 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9eae5f69 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9eae5f69 Branch: refs/heads/ui-restyle Commit: 9eae5f6929da28182a5218199f4bccaf30f4f7f0 Parents: 4f6638d 95bd04e Author: Daan Hoogland <dhoogl...@schubergphilis.com> Authored: Tue Jan 28 13:49:42 2014 +0100 Committer: Daan Hoogland <dhoogl...@schubergphilis.com> Committed: Tue Jan 28 13:49:42 2014 +0100 ---------------------------------------------------------------------- server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
