[GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi...

2015-05-29 Thread vadimkim
Github user vadimkim commented on the pull request: https://github.com/apache/cloudstack/pull/302#issuecomment-106997127 I have checked 4.5/master and it looks good --- 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

[GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi...

2015-05-29 Thread bhaisaab
Github user bhaisaab commented on the pull request: https://github.com/apache/cloudstack/pull/302#issuecomment-106907445 @vadimkim thanks for the fix but it did not apply cleanly. Nevertheless, I applied it manually and merged on both master and 4.5 branch. Can you see if that's alrig

[GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi...

2015-05-29 Thread asfgit
Github user asfgit closed the pull request at: https://github.com/apache/cloudstack/pull/302 --- 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

Re: [GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi...

2015-05-26 Thread Rajani Karuturi
g again. > > Vadim. > > -Original Message- > From: vadimkim [mailto:g...@git.apache.org] > Sent: Tuesday, May 26, 2015 12:10 PM > To: dev@cloudstack.apache.org > Subject: [GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge > conflicts wi... &

RE: [GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi...

2015-05-26 Thread Vadim Kimlaychuk
again. Vadim. -Original Message- From: vadimkim [mailto:g...@git.apache.org] Sent: Tuesday, May 26, 2015 12:10 PM To: dev@cloudstack.apache.org Subject: [GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi... GitHub user vadimkim opened a pull request: https

[GitHub] cloudstack pull request: CLOUDSTACK-8231: fixed merge conflicts wi...

2015-05-26 Thread vadimkim
GitHub user vadimkim opened a pull request: https://github.com/apache/cloudstack/pull/302 CLOUDSTACK-8231: fixed merge conflicts with previous patch We need to port this update to 4.5 branch as well. You can merge this pull request into a Git repository by running: $ git pull h