Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43C0F18264 for ; Mon, 16 Nov 2015 10:19:51 +0000 (UTC) Received: (qmail 99853 invoked by uid 500); 16 Nov 2015 10:19:50 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 99795 invoked by uid 500); 16 Nov 2015 10:19:50 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 99784 invoked by uid 99); 16 Nov 2015 10:19:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2015 10:19:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5C637E0513; Mon, 16 Nov 2015 10:19:50 +0000 (UTC) From: karuturi To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org Message-ID: Subject: [GitHub] cloudstack pull request: Merge 4.6 release branch to master Content-Type: text/plain Date: Mon, 16 Nov 2015 10:19:50 +0000 (UTC) GitHub user karuturi opened a pull request: https://github.com/apache/cloudstack/pull/1071 Merge 4.6 release branch to master Initial merge of 4.6 to master ignored pom.xml version number changes and changes to debian/changelog and engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java Following commands were executed ``` 1. git checkout 4.6 2. git pull --rebase 3. git checkout master 4. git pull --rebase 5. git fwd-merge 4.6 6. git diff --name-only | grep pom.xml | xargs git checkout --ours 7. git diff --name-only | grep pom.xml | xargs git add 8. git checkout --ours engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java 9. git add engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java 10. git checkout --ours debian/changelog 11. git add debian/changelog 12. # manually edited version number in tools/marvin/marvin/deployAndRun.py and tools/marvin/setup.py 13. git commit 14. git checkout -b "merge-46-to-master" ``` You can merge this pull request into a Git repository by running: $ git pull https://github.com/karuturi/cloudstack merge-46-to-master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1071.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 #1071 ---- commit e31ade03c66368c64f0cd66cb7b0b754cddfb79d Author: Remi Bergsma Date: 2015-11-10T14:45:34Z Updating pom.xml version numbers for release 4.6.0 Signed-off-by: Remi Bergsma commit b38c3bed0cfcad84ba4b764a7304ae3ab7b33c00 Author: Remi Bergsma Date: 2015-11-13T20:27:57Z Updating pom.xml version numbers for release 4.6.1-SNAPSHOT Signed-off-by: Remi Bergsma commit d041de0243c6a62e19c701436f75f8a1498d735e Author: Remi Bergsma Date: 2015-11-15T07:36:13Z debian: add 4.6.1-snapshot to changelog commit a0c00c0676b61579dcdb4c7f197825b0cac938a9 Author: Remi Bergsma Date: 2015-11-15T12:41:17Z checkstyle pom didn't get updated with script commit e0ac9df529cb3238142043f9012b3078a2009b7b Author: Remi Bergsma Date: 2015-11-15T12:30:43Z implemented upgrade path from 4.6.0 to 4.6.1 commit 33fb5efd0c41b778ddf64159e0059a55c5b98ece Author: Remi Bergsma Date: 2015-11-15T20:07:45Z more poms didn't get updated with script commit f6db0a2a4948753c9ff584c20b5ae45ada6486f4 Author: Remi Bergsma Date: 2015-11-15T20:09:35Z Merge pull request #1067 from remibergsma/460_461_upgrade_path implement upgrade path from 4.6.0 to 4.6.1The 4.6 branch needs an upgrade path to 4.6.1. I looked at how this was done before and think this will do. Can you give it a second pair of eyes please @DaanHoogland ? When this is indeed OK, I'll do the same for master for the 4.6.0 -> 4.7.0 path. I've tried a build and that works: `mvn clean install` ``` [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 07:33 min [INFO] Finished at: 2015-11-15T13:45:58+01:00 [INFO] Final Memory: 120M/1591M [INFO] ------------------------------------------------------------------------ ``` Once this is a PR, I'll try an actual upgrade from 4.6.0 to 4.6.1-SNAPSHOT. * pr/1067: implemented upgrade path from 4.6.0 to 4.6.1 Signed-off-by: Remi Bergsma commit 17219dfe791320f331c325d54efd01af97ceeb1a Author: Rajani Karuturi Date: 2015-11-16T10:13:08Z Merge release branch 4.6 to master * 4.6: more poms didn't get updated with script implemented upgrade path from 4.6.0 to 4.6.1 checkstyle pom didn't get updated with script debian: add 4.6.1-snapshot to changelog Updating pom.xml version numbers for release 4.6.1-SNAPSHOT Updating pom.xml version numbers for release 4.6.0 ---- --- 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 infrastructure@apache.org or file a JIRA ticket with INFRA. ---