You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by bhaisaab <gi...@git.apache.org> on 2015/03/11 13:15:15 UTC

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

GitHub user bhaisaab opened a pull request:

    https://github.com/apache/cloudstack/pull/112

    4.5 Branch: update pom version and add upgrade path from 4.5.0 to 4.5.1

    - Updates pom version to 4.5.1-SNAPSHOT
    - Adds upgrade path from 4.5.0 to 4.5.1

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/apache/cloudstack stage-451

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cloudstack/pull/112.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 #112
    
----
commit 9ffc8d7aa0bb74dfae9e84bff5b558aed376933c
Author: Rohit Yadav <ro...@shapeblue.com>
Date:   2015-03-11T09:25:26Z

    engine: Add Upgrade path from 4.5.0 to 4.5.1
    
    Encrypts:
    - Remote access vpn preshared key
    - StoragePool's user info
    - Keystore's key
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

commit 9a76d4d6caea9d4a3437030fae717aff8ccdb8e4
Author: Rohit Yadav <ro...@shapeblue.com>
Date:   2015-03-11T09:32:15Z

    Update pom and version usage to 4.5.1-SNAPSHOT
    
    Signed-off-by: Rohit Yadav <ro...@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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by runseb <gi...@git.apache.org>.
Github user runseb commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78288355
  
    @bhaisaab just a thought, but from the commit messages I can't tell the critical bug fix was applied. I think you should merge. We need the pom version switch anyway. And we need to test the release on the actual source.


---
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.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78429111
  
    @runseb yes, I want a linear release too; just use latest 4.5 (after we merge this).
    
    I'm testing it now and then merging if it passes.


---
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.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78252001
  
    Build fine with all unit tests passing, upgrade runs successfully from 4.5.0.
    
    cc @ke4qqq @runseb @daanhoogland - would be great if you can review it


---
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.
---

Re: [GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by sebgoa <ru...@gmail.com>.
On Mar 12, 2015, at 7:11 AM, bhaisaab <gi...@git.apache.org> wrote:

> Github user bhaisaab commented on the pull request:
> 
>    https://github.com/apache/cloudstack/pull/112#issuecomment-78429050
> 
>    @runseb So we've two options:
> 
>    I merge this into 4.5 and then a 4.5.1 RC1 candidate is cut off 4.5 branch. On 4.5 branch there aren't many commits that have went into after 4.5.0 was cut/released.
> 

Maybe I missing something, but let's do this option.

what I see now is that we vote on a hash in a 4.5 branch branch (the RC branch). And even thought the vote passed, 4.5 branch has not yet been updated to 4.5.1-SNAPSHOT.
So in any case -critical bug or not- 4.5 branch needs to be updated with correct version number.


>    Or,
> 
>    I merge this into 4.5 and share only commits that need to be picked on top of 4.5.0 (tag). That is - I'll create a branch from the 4.5.0 tag and cherry-pick commits that need to go into the emergency 4.5.1 and use that for voting?
> 
>    Which one do you prefer?
> 
> 
> ---
> 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.
> ---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78429050
  
    @runseb So we've two options:
    
    I merge this into 4.5 and then a 4.5.1 RC1 candidate is cut off 4.5 branch. On 4.5 branch there aren't many commits that have went into after 4.5.0 was cut/released.
    
    Or,
    
    I merge this into 4.5 and share only commits that need to be picked on top of 4.5.0 (tag). That is - I'll create a branch from the 4.5.0 tag and cherry-pick commits that need to go into the emergency 4.5.1 and use that for voting?
    
    Which one do you prefer?


---
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.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab closed the pull request at:

    https://github.com/apache/cloudstack/pull/112


---
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.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78433858
  
    Ran basic tests against KVM, they passed for merging.


---
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.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by runseb <gi...@git.apache.org>.
Github user runseb commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78300415
  
    
    On Mar 11, 2015, at 5:09 PM, Rohit Yadav <no...@github.com> wrote:
    
    > @runseb the bugs were fixed on 4.5 branch so they are already in 4.5 branch. I think to create 4.5.1 RC one could simply branch off from 4.5 once these commits are merged, or do you only want to create a different branch with only the identified critical bugfixes?
    > 
    > These are the list of important commits IMO that went into 4.5 branch but did n't made into 4.5.0:
    > 
    
    So let me show my ignorance here.
    
    4.5.0 is a tag in the 4.5 branch ? correct ?
    
    Commits were made on top of that to fix some issues including a critical bug fix in 4.5.0 that is forcing us to release 4.5.1 quickly.
    
    Why don't we do a linear release on the 4.5 branch ? Why do you want to branch from 4.5 ?
    
    In the end we vote on a git hash.
    
    
    > 02cadc3
    > f3f47f2
    > f9090ea
    > b2b9de7
    > b879916
    > ab8f367
    > 729e239
    > 
    > �
    > Reply to this email directly or view it on GitHub.
    > 
    



---
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.
---

[GitHub] cloudstack pull request: 4.5 Branch: update pom version and add up...

Posted by bhaisaab <gi...@git.apache.org>.
Github user bhaisaab commented on the pull request:

    https://github.com/apache/cloudstack/pull/112#issuecomment-78295147
  
    @runseb the bugs were fixed on 4.5 branch so they are already in 4.5 branch. I think to create 4.5.1 RC one could simply branch off from 4.5 once these commits are merged, or do you only want to create a different branch with only the identified critical bugfixes?
    
    These are the list of important commits IMO that went into 4.5 branch but did n't made into 4.5.0:
    
    https://github.com/apache/cloudstack/commit/02cadc3fb3fae7f5e8c87b7fafb977fb5eeae6eb
    https://github.com/apache/cloudstack/commit/f3f47f25bab8661f31e5d470995f6f24cc08310e
    https://github.com/apache/cloudstack/commit/f9090eacd6432856ca7504ebdfce38d65f8d019d
    https://github.com/apache/cloudstack/commit/b2b9de7fa39825e8ff111353619df4e5aece12e6
    https://github.com/apache/cloudstack/commit/b879916f5c64ddbca8713852b2c0ac187e9be1ff
    https://github.com/apache/cloudstack/commit/ab8f367850c7ef75e1ff851397ff7dee4b5e40ab
    https://github.com/apache/cloudstack/commit/729e239a471dc9910f550e7ce0c01e29fa920381



---
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.
---