Merge branch 'volume-upload' of https://git-wip-us.apache.org/repos/asf/cloudstack into volume-upload
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d6318e5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d6318e5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d6318e5 Branch: refs/heads/master Commit: 3d6318e539bb8bb967a01b5413538c7357e29ff0 Parents: 736f704 878b43b Author: sailajamada <sailaja.m...@citrix.com> Authored: Thu Apr 2 09:32:40 2015 +0530 Committer: sailajamada <sailaja.m...@citrix.com> Committed: Thu Apr 2 09:32:40 2015 +0530 ---------------------------------------------------------------------- .../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
