GitHub user karuturi opened a pull request:
https://github.com/apache/cloudstack/pull/38
Merge 4.5 to master
I saw conflicts in the following two commits and resolved in favour of
master commit
4.5: d82e556dcd980bac50f27eaca284983808e04b1c
master: 68745ae9b1652393974f457137c9c7c1df333810
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/38.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 #38
----
commit 310bb255acd74b6347bd778590e15543eef7333b
Author: Bharat Kumar <[email protected]>
Date: 2014-10-17T05:54:40Z
CLOUDSTACK-7760 Data disk size is not considering for primary storage
resource limit check
commit 0e7f1ea9b819de197e70a088e92d7ffb7016d063
Author: Bharat Kumar <[email protected]>
Date: 2014-10-22T05:59:22Z
CLOUDSTACK-7763 Reservations for VMware VMs remain after dynamic scaling
commit cdabb2407a0761939d5159fd2317ebd7dcca4eb7
Author: Damodar <[email protected]>
Date: 2014-11-05T11:49:46Z
CLOUDSTACK-7843: sync Job Failures always reported as success on Event Bus
commit 34f31f90331d0027b133ccdc8fdb65ab86ce26cc
Author: Damodar <[email protected]>
Date: 2014-11-06T06:34:30Z
CLOUDSTACK-7851:MS does not start after the VM it is running on is rebooted
commit 36fd780482dbd65ef9328f630d0af0793d0fed2e
Author: Damodar <[email protected]>
Date: 2014-11-10T09:10:36Z
CLOUDSTACK-7830: Usage Job fails with "Data too long for column 'user_name'"
commit 0bd34d389f93b56e74a6bb04054c8e419bf8571e
Author: Jayapal <[email protected]>
Date: 2014-11-07T04:07:32Z
CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the
network
commit 3e00f99c535e318faab4c09ac943fd8540f81d17
Author: Gaurav Aradhye <[email protected]>
Date: 2014-11-10T06:28:18Z
CLOUDSTACK-7866: Passing type value to list_hosts method so as to avoid
listing SSVM and CPVM
Correcting hostid attribute
Signed-off-by: SrikanteswaraRao Talluri <[email protected]>
commit f78defda0fa1c07d440b484c414b16a09e58433a
Author: Chandan Purushothama <[email protected]>
Date: 2014-11-07T23:32:45Z
CLOUDSTACK-7863: Fix the script 'test_vpc_vms_deployment.py' - Test Cases
failing on Simulator as Testcases try to ssh to the VMs
Signed-off-by: SrikanteswaraRao Talluri <[email protected]>
commit 2f7959d2190d3afbd71f42a84725b75107f925d8
Author: Chandan Purushothama <[email protected]>
Date: 2014-11-07T23:00:03Z
CLOUDSTACK-7862: Fixed the script 'maint/test_high_availability.py' - Test
Cases failing on Simulator as Testcases try to ssh to the VMs
Signed-off-by: SrikanteswaraRao Talluri <[email protected]>
commit 23df5f22ac96bf8032d10a5b65c6016534d67fcb
Author: Gaurav Aradhye <[email protected]>
Date: 2014-11-06T12:53:08Z
CLOUDSTACK-7856: test_vpc_network_pf_rules.py - Check if httpd service is
running or not, if not, start it
Signed-off-by: SrikanteswaraRao Talluri <[email protected]>
commit 53694133d8848d56cdf10bf756022b3f2e9cf8d0
Author: Gaurav Aradhye <[email protected]>
Date: 2014-10-31T06:22:44Z
CLOUDSTACK-7823: test_snapshots.py - remove test case dependency on each
other
Signed-off-by: SrikanteswaraRao Talluri <[email protected]>
commit 85ac979f72e7ea4b65f466429e786fe468a03646
Author: Gaurav Aradhye <[email protected]>
Date: 2014-10-30T12:35:41Z
CLOUDSTACK-7818: Fixing test_escalations_instances.py, Removing dependency
of test cases on each other
Signed-off-by: SrikanteswaraRao Talluri <[email protected]>
commit c401dbc8f986563159f49f5c419ad31437ef9d04
Author: Rohit Yadav <[email protected]>
Date: 2014-11-10T12:21:25Z
CLOUDSTACK-7871: allow VM and template details update using update APIs
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and
updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB
hacking.
Signed-off-by: Rohit Yadav <[email protected]>
(cherry picked from commit 97fa4a023e2346b3b9f56bf213ed4125c371ca6d)
Signed-off-by: Rohit Yadav <[email protected]>
commit c916f30574ebd3e909be3dc0e8ca74ae9ef7c5ce
Author: Santhosh Edukulla <[email protected]>
Date: 2014-11-03T07:10:13Z
CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again.
Use row lock to ensure that prev state is either Allocating or Free. This will
inturn avoid logging duplicate events
commit 32dc5243b6bfa0f51ffb3eeaf49e4b7fef5edf55
Author: Santhosh Edukulla <[email protected]>
Date: 2014-11-10T14:35:32Z
CLOUDSTACK-7873 Fixed the user vm details length issue for higher key
lengths
commit 6d268db217a0c9dd0701a85f4d0244461c9ebd0b
Author: Koushik Das <[email protected]>
Date: 2014-11-11T11:02:20Z
CLOUDSTACK-7880: Creating shared network results in exception
This is due to event publish being wrapped in a transaction, moved it
outside of transaction scope.
commit 7efc4c388fc96bb76acd1dbc0c2d344ddc23f2d1
Author: SrikanteswaraRao Talluri <[email protected]>
Date: 2014-11-11T13:48:59Z
CLOUDSTACK-7865: fixed pep8 errors and errors in wrong references
to the variables
commit f2cedda9efece05ef702170d5b6d3858a44de3f9
Author: Min Chen <[email protected]>
Date: 2014-11-01T00:20:16Z
CLOUDSTACK-7884: Cloudstack MS is not responding (happening randomly) after
some restart.
commit 0c45c96ec718edf29ba55fea7dbfda04cc3495e5
Author: Min Chen <[email protected]>
Date: 2014-11-11T18:38:46Z
CLOUDSTACK-7864: CPVM continues to be in Stopped state after a failure to
start because of a management server restart. Added optimization to purge queue
items for cancelled jobs.
commit f1361796bf1fc73a65c47583dd0a5d6ef2dc3c27
Author: Damodar <[email protected]>
Date: 2014-11-11T12:46:06Z
CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if
CS fail to contact rabbit mq server. This is happening in case of Async API
calls.
Signed-off-by: Koushik Das <[email protected]>
commit d82e556dcd980bac50f27eaca284983808e04b1c
Author: Mihaela Stoica <[email protected]>
Date: 2014-11-11T17:34:50Z
CLOUDSTACK-7645: [UI] Fixed incorrect label issues caused the dictionary
split
In some cases the UI does not display the correct text, displaying
'label.xyz' instead of the localized string.
This appears to be due to the dictionary split: entries in dictionary2.jsp
are not found because the dictionary has not been extended with dictionary2 as
expected.
In this fix:
- Instead of extending the dictionary, we leave it as it is and change the
localization function to look in the dictionary first and, if the item is not
found there, then look in dictionary2.
- This way we are not depending on the extent() function to be called at
the 'right' time; In turn, the localization function will be aware of both
dictionaries.
- In the future, when we add another dictionary, we will have to modify
this function only.
commit 4e820b37b0b8f5318e992330a3a9a7f6f9998cff
Author: Mihaela Stoica <[email protected]>
Date: 2014-11-04T16:22:20Z
CLOUDSTACK-7645
[UI] Fix incorrect strings 'label.no' and 'label.added.network.offering'
Conflicts:
ui/dictionary2.jsp
commit a4b92e908aa6271d3aa94656ca5d4d1ac6fd5c6c
Author: Prachi Damle <[email protected]>
Date: 2014-11-12T03:25:46Z
CLOUDSTACK-7590 Deletion of Account is not deleting the account from the
database
Revert "CLOUDSTACK-7073: Added domainId field to the user table in order to
restrict duplicated users creation on the db level"
This reverts commit 5a96d8ef5cbc88df366016ae9dd7ee46e4ca417a.
Conflicts:
setup/db/db/schema-440to450.sql
commit 6c955a3a472da1308a5336a48b29514b78c543e4
Author: Pierre-Luc Dion <[email protected]>
Date: 2014-11-13T00:18:37Z
CLOUDSTACK-7887: change int to str into swiftxen
commit 9809164654159fd1cea4842d76a6a0b97fc72e54
Author: Jessica Wang <[email protected]>
Date: 2014-11-13T00:24:15Z
CLOUDSTACK-7896: UI > network > Add Guest Network > when zone dropdown is
empty, do not make API call to get physical networks.
commit 76de3a182b5643df18f190b42c1be12275404747
Author: Rajani Karuturi <[email protected]>
Date: 2014-11-13T05:00:20Z
Merge branch '4.5'
Conflicts:
framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
setup/db/db/schema-441to450.sql
test/integration/component/test_escalations_instances.py
ui/dictionary2.jsp
ui/scripts/cloudStack.js
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
