Merge branch '4.8' into 4.9
Conflicts:
client/WEB-INF/classes/resources/messages_es.properties
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e001259
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e001259
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e001259
Branch: refs/heads/4.9-bountycastle-daan
Commit: 1e0012599ce94f1964bd56c286409fede28c4aff
Parents: 8ee418b 9eb8b2e
Author: Rohit Yadav <[email protected]>
Authored: Fri Sep 2 00:38:08 2016 +0000
Committer: Rohit Yadav <[email protected]>
Committed: Fri Sep 2 00:38:08 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
