GitHub user nemo9cby opened a pull request: https://github.com/apache/cloudstack/pull/1704
Log refactoring/improving suggestions You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/cloudstack master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1704.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 #1704 ---- commit de041df74d53a4b867fc7f65d2844fb519316297 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-07-20T06:26:00Z packaging: Marvin and integration-tests packages This introduces two new cloudstack packages: marvin and integration-tests. The two packages will make it easier for CI systems to install Marvin for a specific cloudstack release/build and run integration tests that are specific for that version/build. - maven: add explicit juniper-contrail-api maven repository - marvin: build source distribution for both install and package mvn phases Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit 62aa3b2bfaeb665ba960d8115cb93541bb42adc4 Author: Will Stevens <williamstev...@gmail.com> Date: 2016-07-29T14:11:34Z Updating pom.xml version numbers for release 4.10.0-SNAPSHOT Signed-off-by: Will Stevens <williamstev...@gmail.com> commit 8ac3c883cd61fa0e18498aaae4e4f519743295c4 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-07-11T11:36:09Z oobm: simply change password transactional logic - Simplifies change password transactional logic without using pessmistic locks - Adds a re-enter password field in the UI to valid ipmi/oobm password Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit 546a3f8884398391760b76ddcf02e6bc1f30d642 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-04T07:33:46Z cloudstack: fix upgrade paths to 4.10.0 Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit fd7273b446738c0ebfae84189502dbdcd18bfd42 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-04T10:01:51Z server: give more memory to tests Increases allowed max and permgen memory flags to maven-surefire plugins. This fixes unit test failures in cloud-server. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit e5750b3331d2d970aad569b8cbcbcaee3e9951ea Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-04T10:01:51Z server: give more memory to tests Increases allowed max and permgen memory flags to maven-surefire plugins. This fixes unit test failures in cloud-server. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit fd7273b446738c0ebfae84189502dbdcd18bfd42) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit b607a3900d7931f58301de0da7ba9b56d3b26b7b Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-04T11:10:05Z Merge pull request #1625 from shapeblue/dbupgrade-fix-4.10 [blocker] cloudstack: fix upgrade paths to 4.10.0This adds an upgrade to master since the recent 4.9 cut, adds an upgrade path to the new code version 4.10. Without this PR all PRs to master are failing due to missing upgrade path. Please merge this on priority. Code review and Travis results should be enough to validate the changes. /cc @karuturi @wido @ProjectMoon @abhinandanprateek * pr/1625: server: give more memory to tests cloudstack: fix upgrade paths to 4.10.0 Signed-off-by: Rajani Karuturi <rajani.karut...@accelerite.com> commit 9127af61e4ce770c4d015bef7f20b8e50847bec7 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-05T06:25:48Z Merge pull request #1612 from shapeblue/package-marvin-tests packaging: Marvin and integration-tests packagesThis introduces two new cloudstack packages: marvin and integration-tests. The two packages will make it easier for CI systems to install Marvin for a specific cloudstack release/build and run integration tests that are specific for that version/build. Since Marvin may have its own dependencies, we're bundling the Marvin source tarball and installing it with pip in the post-installation script/phase. This also fixed a build issue with using juniper-api maven repo. /cc @swill @PaulAngus @jburwell @wido @bvbharat * pr/1612: server: give more memory to tests packaging: Marvin and integration-tests packages Signed-off-by: Rajani Karuturi <rajani.karut...@accelerite.com> commit 2cddaf3d36cf76f5db601d583ba3d06aaf2778dd Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-05-04T10:51:24Z CLOUDSTACK-9447: fix build and upgrade to debian 7.11 iso - Update base debian iso to version 7.11 - Upgrade ruby version to 2.3.0 (latest/stable) - Fix Gemfile - Update README - Fix openswan pkg name with the same version - Remove cloud-cleanup it's not available Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit a54a3b5cd5fece41ffaad720ed54317c41a0dec5 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-05T08:59:16Z Merge release branch 4.7 to 4.8 * 4.7: server: give more memory to tests packaging: Marvin and integration-tests packages commit c03d035c8bd97faf9eb751590d4d67625a9f07bd Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-05T09:00:45Z Merge release branch 4.8 to 4.9 * 4.8: server: give more memory to tests packaging: Marvin and integration-tests packages commit 3315eb5420e1b2cedf906aeb709740efc2f08cfd Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-05T09:08:09Z Merge release branch 4.9 to master * 4.9: Updating pom.xml version numbers for release 4.9.0 commit 2875af71126cbfb6ebd0d47c2d593ff6d9c61c20 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-05T09:11:31Z Merge release branch 4.9 to master * 4.9: server: give more memory to tests packaging: Marvin and integration-tests packages commit 4c387feebbffdb6724fffa28f67c65fdb82bcdc2 Author: Rajani Karuturi <karut...@users.noreply.github.com> Date: 2016-08-05T09:36:52Z updated contributin.md As this is the doc that is showed while creating a pull request, updated it with information from release principles wiki. commit 98228c5fb1d5fd6eecd46eff631e630e4b192d08 Author: Pierre-Luc Dion <pdion...@apache.org> Date: 2016-08-06T18:38:20Z add projectid to project details page commit d87828af2449907192dfd69a22fdb9cd5780d329 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-08T09:32:03Z Fix debian build error due to commit 3315eb5420e1b2cedf906aeb709740efc2f08cfd commit 3afedbb24fb1d327ce28256ba37c03b4a9f3400d Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-08T11:17:09Z Merge pull request #1631 from karuturi/merge-49-to-master-deb-build Fix debian build error due to commit 3315eb5debian build is broken due to the changelog changes in commit 3315eb5. Fixed the same. To test, do a debian following the instructions at http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/4.8/building_from_source.html#building-deb-packages cc: @pdion891 @rhtyd Please review. * pr/1631: Fix debian build error due to commit 3315eb5420e1b2cedf906aeb709740efc2f08cfd Signed-off-by: Rajani Karuturi <rajani.karut...@accelerite.com> commit a63db21d16072821a1e27473813fddf36accfdd4 Author: Will Stevens <williamstev...@gmail.com> Date: 2016-08-08T14:06:21Z Updating pom.xml version numbers for release 4.8.1 Signed-off-by: Will Stevens <williamstev...@gmail.com> commit 3cc3aea4492bdc7b571b5e459c14b4d5b4780e67 Author: Pierre-Luc Dion <pdion...@apache.org> Date: 2016-08-09T00:04:55Z Add to project detail page: cpu,memory,template,storage and VMs count commit bdc409c7a2cc0e8119fd37261458c62ba3fe4539 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-09T10:19:04Z Merge pull request #1626 from shapeblue/systemvmtemplate-4dot9 [blocker] Fix systemvm template buildPrevious PR: https://github.com/apache/cloudstack/pull/1531 Fixes failing systemvmtemplate build. * pr/1626: CLOUDSTACK-9447: fix build and upgrade to debian 7.11 iso Signed-off-by: Rajani Karuturi <rajani.karut...@accelerite.com> commit 56a352650271f09b6bf2d50e6e9cb377997539e8 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-09T10:21:15Z Merge release branch 4.9 to master * 4.9: CLOUDSTACK-9447: fix build and upgrade to debian 7.11 iso commit 7b8ba24c647c218265384c7f84cafb1dddb9219c Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-10T08:43:40Z CLOUDSTACK-9452: add python-argparse dependency on el6,7 rpms The patchviasocket script was rewritten in Python from PR #1533 and made assumptions that Python 2.7 would be available. In case of CentOS, python 2.7 may not be available or installed. This change ensures that python-argparse is installed which is used by this script. Expose cmd error in the logs when patch command fails. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit 007c9f0d3a5b3e03c33e2b8f3853cfad2f9fe0d9 Author: Will Stevens <williamstev...@gmail.com> Date: 2016-08-15T14:28:33Z Merge branch '4.8.1-RC20160808T1006' into 4.8 commit 740bd45be648d169ddc9c8fe697f960ebcaff3c9 Author: Will Stevens <williamstev...@gmail.com> Date: 2016-08-15T14:31:09Z Updating pom.xml version numbers for release 4.8.2-SNAPSHOT Signed-off-by: Will Stevens <williamstev...@gmail.com> commit d3e45515ee30642c657ee853bfa448290da54910 Author: Rajani Karuturi <rajani.karut...@accelerite.com> Date: 2016-08-16T08:24:24Z Merge pull request #1628 from karuturi/patch-1 updated contributing.mdAs this is the doc that is showed while creating a pull request, updated it with information from release principles wiki. * pr/1628: updated contributin.md Signed-off-by: Rajani Karuturi <rajani.karut...@accelerite.com> commit a2fcc65d9050b9cd6915e36e5274379aa3298957 Author: Abhinandan Prateek <abhinandan.prat...@shapeblue.com> Date: 2016-08-16T08:34:43Z CLOUDSTACK-9459: the try's catch block was shortening the preparedstatement life resulting in bad resultset when used outside of try catch. commit 7a53feee22c873c4e35c86b3fc1d4647314b62bf Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-06-28T10:23:20Z marvin: fix codegeneration against API discovery endpoint This makes the commands.xml based codegeneration equivalent to the API discovery end point based discovery. This fixes the fields that the (api discovery based) codegenerator should produce in the generated python classes (cmd and response classes per api/module). The issue was that the autogenerated cloudstackAPI differed between api-based and apidocs-based code generation. With this fix the generated classes match exactly thereby allowing us to go with either methods to generate cloudstackAPI. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit b87eda230a84cc90c0459e74768d3d3d30897c14 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-18T09:40:09Z cloudstack: upgrade path from 4.9.0 to 4.9.1 - Adds db upgrade path from 4.9.0 to 4.9.1 - CLOUDSTACK-9449: Fix typo in default user role description Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit f13c224da1ffa24ae710aa5edd7cbd8c962447b3 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-18T09:45:24Z Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> commit f699fd4a15c8e58c534e98d8436beedf3b54fdc5 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Date: 2016-08-19T11:57:20Z CLOUDSTACK-9463: Fix dynamic-roles migrate script for old format The old commands.properties format included the full class name such as: createAccount=com.cloud.api.commands.CreateAccountCmd;1 The migration script did not consider this format and fails. With this fix the migration script will process both the formats, including processing a commands.properties file with mixed format, for example: $ cat commands.properties ### Account commands createAccount=1 deleteAccount=2 markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;3 $ python scripts/util/migrate-dynamicroles.py -d -f commands.properties Apache CloudStack Role Permission Migration Tool (c) Apache CloudStack Authors and the ASF, under the Apache License, Version 2.0 Running this migration tool will remove any default-role permissions from cloud.role_permissions. Do you want to continue? [y/N]y The commands.properties file has been deprecated and moved at: commands.properties.deprecated Running SQL query: DELETE FROM `cloud`.`role_permissions` WHERE `role_id` in (1,2,3,4); Running SQL query: INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 1, '*', 'ALLOW', 0); Running SQL query: INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 2, 'deleteAccount', 'ALLOW', 0); Running SQL query: INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`, `permission`, `sort_order`) values (UUID(), 2, 'markDefaultZoneForAccount', 'ALLOW', 1); Static role permissions from commands.properties have been migrated into the db Running SQL query: UPDATE `cloud`.`configuration` SET value='true' where name='dynamic.apichecker.enabled' Dynamic role based API checker has been enabled! Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> ---- --- 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. ---