GitHub user DaanHoogland opened a pull request:
https://github.com/apache/cloudstack/pull/23
Merge 4.5 back into master
It would be good to have this as a daily practice
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/DaanHoogland/cloudstack merge-master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/23.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 #23
----
commit 3cac7f01bb7799e117460a67dc8506397536162d
Author: David Nalley <da...@gnsa.us>
Date: 2014-10-13T03:19:30Z
Revert "CLOUDSTACK-6278"
This reverts commit bc2ec23d09e28b30a9cc3cb4a7d6f52c8e718fcf.
commit ac48aa8e0c10cdb37d355e0fa04479abdf785cc3
Author: David Nalley <da...@gnsa.us>
Date: 2014-10-13T03:30:04Z
cleaning up some from a revert
commit ffe846673cbb3d25b5331ed281d6e8f58764f5ff
Author: David Nalley <da...@gnsa.us>
Date: 2014-10-13T03:31:17Z
more revert cleanup
commit f456cda8cc337fc7b13dc53c9a0a274cd1e851a7
Author: Gabor Apati-Nagy <gabor.apati-n...@citrix.com>
Date: 2014-09-16T17:08:36Z
CLOUDSTACK-7561: UI: After creating a new account, the "Add Account" dialog
remains open
-Removed unused code that was causing javascript exception
Signed-off-by: Brian Federle <brian.fede...@citrix.com>
(cherry picked from commit 30611be15abd4cd8843c10ddb2d3b131aea2cda3)
commit 4fd0799d300920e54b1054f9ec51cc5dda8bb31e
Author: Gabor Apati-Nagy <gabor.apati-n...@citrix.com>
Date: 2014-09-16T17:15:58Z
CLOUDSTACK-7562: Details page for disk offerings only show details for
write performance
-Fixed all related typos
Signed-off-by: Brian Federle <brian.fede...@citrix.com>
(cherry picked from commit dbb70fadc0767974a7a87b4c5491ba9517ea1804)
commit 8f4e8a4d79bbe1bb7497ca2043a087c556f06cc8
Author: Sangeetha Hariharan <sangeetha.hariha...@citrix.com>
Date: 2014-09-19T21:51:10Z
CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related
test cases.
(cherry picked from commit 7877f3f9603b967680cf9480cb6e51845a81ddd8)
commit 988b9efc97436da9dc6ecec567127d96fd2f4db1
Author: Nitin Mehta <nitin.me...@citrix.com>
Date: 2014-09-19T20:40:17Z
CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes
get deleted from CS. Fix it by changing the unique name generation to the
standard one used by registertemplate. Also cleaned up vmtemplatevo which had
too many constructors.
(cherry picked from commit 082aed3d33109903208014432eebbe3e69737d4e)
commit 9bbcef454050bc5242eee8ee4db44e40671a58cb
Author: punith-cloudbyte <punit...@cloudbyte.com>
Date: 2014-09-17T12:23:47Z
IOPS null issue CLOUDSTACK-7570
Signed-off-by: Mike Tutkowski <mike.tutkow...@solidfire.com>
(cherry picked from commit dd4f6bcaf3a380e52c987e4a400fce09fb180006)
commit b979c6f0c7c50f0ade0987bcc52543f8f9edc23b
Author: Min Chen <min.c...@citrix.com>
Date: 2014-09-19T22:12:09Z
CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after
management server restarts.
(cherry picked from commit 7cdb67dcf1ec4158ec0ab4c2fa868cc63121bbb5)
commit e0317eeec456a4ad8585238500b6786142772530
Author: Devdeep Singh <devd...@gmail.com>
Date: 2014-09-19T11:26:05Z
CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit
as part of
cleaning up vmsync changes, checkvirtualmachine command was updated to
return the
power state of the vm. The change was missed for Hyper-V. This caused
migration to
fail on cloudstack even though it used to succeed on the hypervisor.
Updated the
hyper-v agent code to return the cloudstack equivalent power state for
check virtual
machine answer.
(cherry picked from commit 5350e61187d5b2f9fdc997dcc9fea34ff68148f7)
commit b771b6ee72a5cb6d52ba6544c8fd6b7c2c5f47ff
Author: Prashant Kumar Mishra <prashantkumar.mis...@citrix.com>
Date: 2014-09-19T07:52:00Z
CLOUDSTACK-7579 Adding a method to base.py to update storage pool
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org>
(cherry picked from commit 937aee34eded1a795b4eff3b7ebb59b8fbbef568)
commit ce2fe3e5dffca2cb13edffd89d2feb1ec51de07a
Author: sanjeev <sanj...@apache.org>
Date: 2014-09-22T10:57:44Z
In case of Hyper-v ssvm/cpvm reboot takes time so made changes to handle
this
(cherry picked from commit 5bddebb8fc6eb85753a030f1d71fe2303969325b)
commit 1b0618d39c914151c73e11175643b655145c3143
Author: Koushik Das <kous...@apache.org>
Date: 2014-09-22T11:10:12Z
CLOUDSTACK-7595: Config parameters "job.expire.minutes" and
"job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
Removed the unnecessary multiply factor for both the config parameters.
Also removed the duplicate entries from Config.java as these are not required
(cherry picked from commit a6ee4112a54043033233334c900d9bcd1cebf157)
commit 4076d87038127b1b04ae653a250ba8efed306da2
Author: sanjeev <sanj...@apache.org>
Date: 2014-09-23T08:45:39Z
Creating custom disk does not work as expected
(cherry picked from commit 0d5a435f7669eddd44a6b62317fe26bb1d96e96c)
commit f2eec470abccfcbca0c373d0de49e44ead2460fa
Author: Rajesh Battala <rajesh.batt...@citrix.com>
Date: 2014-06-09T09:12:16Z
CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring after
upgrading from 4.3 to 4.4
(cherry picked from commit c282bb3a1293fbbfdb306263ea52464862670fb3)
(cherry picked from commit fc7d0b2a333e510619f14528a72e35bbf9ed7045)
(cherry picked from commit 0c3d0cc954b7c276640a71b636f78928f55e97a2)
commit 5c2094eec1408494586e48d38d9076b31ca3e5f5
Author: sanjeev <sanj...@apache.org>
Date: 2014-09-18T08:48:14Z
CLOUDSTACK-6172: Adding new test case to verify this fix
Conflicts:
test/integration/component/test_volumes.py
Signed-off-by: sanjeev <sanj...@apache.org>
CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46ad7c78b4842c1f52f552998a33f8836)
commit b4bddc61ac47d301200a299ea129169e98b09a74
Author: Anthony Xu <anthony...@citrix.com>
Date: 2014-09-24T17:57:36Z
timeInSeconds * 1000
timeInSeconds is int type, if timeInSeconds is very big, it makes
"timeInseconds * 1000" very small even 0
(cherry picked from commit f5eae55abb4591109dd22c1ba9d25f0876ebe52f)
commit d036168ecb3a70c6205638e5c65937be8daffa46
Author: Anthony Xu <anthony...@citrix.com>
Date: 2014-09-24T17:28:04Z
cleaning up more conflicts
commit 555b20f7ece797d88844392b03d90bd118b48cac
Author: Jessica Wang <jessicaw...@apache.org>
Date: 2014-09-24T21:25:22Z
CLOUDSTACK-7625: UI > IP Address page > EnableVPN > If
createRemoteAccessVpn returns success, but the newly created remoteaccessvpn
object's state is not Running, treat it as a failure.
(cherry picked from commit b592e0af345c38b5a898ec238bc4f2c8cedf6ef9)
commit 3ebf49ab28e3b6b4543756115e7af590bc03e680
Author: Min Chen <min.c...@citrix.com>
Date: 2014-09-25T00:27:39Z
CLOUDSTACK-7628:VM Worker job should be expunged one hour after
completion instead of currently being expunged whenever cleanup task
thread is run.
(cherry picked from commit 4317a85e97643c681b98b3e58990ec2f22abedd8)
commit 7a4a0d7aaa4dba7a1ccb1712bbc4e76d5cba8547
Author: Jayapal <jaya...@apache.org>
Date: 2014-09-24T10:12:27Z
CLOUDSTACK-7622: Fixed deleting network when provider is disable
commit 89736d011e66f193ace97427aea675e2333ac94d
Author: Chandan Purushothama <chandan.purushoth...@citrix.com>
Date: 2014-09-16T06:15:57Z
CLOUDSTACK-7555 - Fixed the test_usage script - Template now belongs to the
Regular Account to test TEMPLATE.CREATE Event
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org>
(cherry picked from commit f3252db797a6d53a1922a60b29cd6b4914de7d51)
commit 43a9bbf5091ae5a3e7546a02c84313b2312e9506
Author: Devdeep Singh <devd...@gmail.com>
Date: 2014-09-25T07:40:12Z
CLOUDSTACK-7598: When a vm deployed by cloudstack is stopped on the
hypervisor
(outside cloudstack), the state of the vm is not updated in cloudstack db.
The
ping task was not checking for resource (host) status by default. The power
state of the vms is returned as part of the resource status. Fixed the
issue by
making sure ping task atleast tries once to get the resource status.
(cherry picked from commit 55b4ead49594212ba55bfcf7007b0cae11bf68ba)
commit cd3df842f2231acd96cf38f6dfa640d2635b74ee
Author: Saksham Srivastava <saksham.srivast...@citrix.com>
Date: 2014-09-25T10:29:08Z
CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog does not
anymore support reload option on debian wheezy
(cherry picked from commit 3a8c450890299ba02bcc245d962b87da0306b2e1)
commit a35521315e21d274bdae93ed89462b0c5909789c
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Date: 2014-09-25T14:43:48Z
CID-1223274: Remove dead local storage code from VolumeApiServiceImpl
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit 60e492aeb9a9ea53f6e741ec6718c618a9b27aeb)
commit a420028d67e8551facc4e1d31ccd51e5654aa87c
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Date: 2014-09-25T15:12:40Z
XenServer56FP1Resource: remove unused import
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit 410092bbe1b81a254a207edf724b7768fcb5a9fc)
commit fbb9e2b2104a5fd55118346651bfe621f6df7454
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Date: 2014-09-25T15:03:47Z
CID-1192798: Remove unused boolean variable
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit 6e06ae9e8ea879e892d6311761a6042fa78cea3f)
commit ff42d5ad54b2c7c8f1570addb14b4d7c477400ba
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Date: 2014-09-25T14:52:09Z
CID-1211005: Fix comparison, Class<?> is always instance of Class
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit 59482b3eba268570885d64dc9b0527a90cabbc07)
commit 4d8dfc9b7c5706f4384bcdb2301f88e1cf8d4c82
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Date: 2014-09-25T15:02:13Z
CID-1192810: Remove useless control flow
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit f74446a195d2a0fa4f1380254416a8a8538a6893)
commit 6e04f9378577da8e472bc5e9b38126c05418a4ad
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Date: 2014-09-25T14:59:47Z
CID-1192822: ids is a List<Long>, the cast to List<?> is removed
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit 92858afd55a2a19cf698bbbf34c891fbf8087e9d)
----
---
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.
---
