GitHub user karuturi opened a pull request:
https://github.com/apache/cloudstack/pull/42
Merge 4.5 to master
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/karuturi/cloudstack merge-45-to-master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/42.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #42
----
commit 2d3b3376e37faeec3ed62a58750819dc7630260c
Author: Sheng Yang <sheng.y...@citrix.com>
Date: 2014-11-14T19:43:03Z
Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly
declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"
This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888.
It breaks Windows 7 client.
commit 425a6b01d60b88016c23a1126960375b00d97069
Author: Anthony Xu <anthony...@citrix.com>
Date: 2014-11-14T19:24:42Z
CLOUDSTACK-7918:
guest os name changes from 'SUSE Linux Enterprise Server 12 (experimental)'
to 'SUSE Linux Enterprise Server 12 (64-bit)' in latest XS 5.6 ,
changed the guest OS mapping to fix it.
commit 303fc90057db2707ae8f6b709fb5e3e86fc9db40
Author: Milamber <milam...@apache.org>
Date: 2014-11-15T08:37:49Z
Update L10N resource files on master branch (with 4.5 translation strings)
commit 25e5d00f6016b31fc178da97c7125c2f37a8c40d
Author: Milamber <milam...@apache.org>
Date: 2014-11-15T08:38:34Z
Add 4.5.x messages.properties to Transifex config tool
commit 19781e094b987cf65d05d890cd3cd86fc22cb873
Author: Chandan Purushothama <chandan.purushoth...@citrix.com>
Date: 2014-11-14T06:56:01Z
CLOUDSTACK-7913 : Added reconnect functionality to Host class in base.py
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org>
commit 5f99917991a59f8ecd6d8b0e17b497fe210e636e
Author: Gaurav Aradhye <gaurav.arad...@clogeny.com>
Date: 2014-11-14T14:23:25Z
CLOUDSTACK-7912: Remove hardcoded netscaler info and read it from config
file
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org>
commit 635abaf2e9ca4f0399085f441ea6d5eeaab9f3ab
Author: Jessica Wang <jessicaw...@apache.org>
Date: 2014-11-17T21:05:08Z
CLOUDSTACK-7927: UI > Infrastructure > Primary Storage > detailView > add
"View Volumes" link that will list all volumes under this primary storage when
being clicked.
commit aa5cb0838a340b9521f98a6dfc18bf076ab6f454
Author: Rajani Karuturi <rajanikarut...@gmail.com>
Date: 2014-11-18T06:12:07Z
Merge branch '4.5'
Conflicts:
client/WEB-INF/classes/resources/messages_zh_CN.properties
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
