Skip to content

CLOUDSTACK-8231: fixed merge conflicts with previous patch#302

Closed
vadimkim wants to merge 4 commits into
apache:masterfrom
vadimkim:master
Closed

CLOUDSTACK-8231: fixed merge conflicts with previous patch#302
vadimkim wants to merge 4 commits into
apache:masterfrom
vadimkim:master

Conversation

@vadimkim
Copy link
Copy Markdown
Contributor

@vadimkim vadimkim commented May 26, 2015

We need to port this update to 4.5 branch as well.

@asfbot
Copy link
Copy Markdown

asfbot commented May 26, 2015

Vadim Kimlaychuk on dev@cloudstack.apache.org replies:
Rohit,

I have merged my local branch with master and resolved conflicts.  Pull re=

quest showed modifications that I have made precisely. But when I created t=
he request it contains multiple files (not just those I have changed). Plea=
se review this. I think I have done something wrong again.

Vadim.

@asfbot
Copy link
Copy Markdown

asfbot commented May 26, 2015

cloudstack-pull-requests #239 SUCCESS
This pull request looks good

@asfbot
Copy link
Copy Markdown

asfbot commented May 27, 2015

Rajani Karuturi on dev@cloudstack.apache.org replies:
Yesterday I noticed some sync issues between github and git-wip-us.apache.
github didnt have all the commits from apache. May be that is the reason
why you are seeing additional commits in your pull request.

~Rajani

@asfgit asfgit closed this in 94f1ebb May 29, 2015
asfgit pushed a commit that referenced this pull request May 29, 2015
@vadimkim @yadvr
CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules
f8e1ff1 
This closes #302

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 94f1ebb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr
Copy link
Copy Markdown
Member

yadvr commented May 29, 2015

@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 alright and test 4.5/master. I know about this issue but don't have a setup to test it, but the code looks good to me.

@vadimkim
Copy link
Copy Markdown
Contributor Author

vadimkim commented May 30, 2015

I have checked 4.5/master and it looks good

yadvr pushed a commit to shapeblue/cloudstack that referenced this pull request Aug 3, 2015
@vadimkim @yadvr
CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules
8c6aead 
This closes apache#271
This closes apache#302

(cherry picked from commit f8e1ff1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
yadvr pushed a commit to shapeblue/cloudstack that referenced this pull request Aug 5, 2015
@vadimkim @yadvr
CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules
46433c1 
This closes apache#271
This closes apache#302

(cherry picked from commit f8e1ff1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
yadvr pushed a commit to shapeblue/cloudstack that referenced this pull request Oct 30, 2015
@vadimkim @yadvr
CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules
85e1eb7 
This closes apache#271
This closes apache#302

(cherry picked from commit f8e1ff1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
yadvr pushed a commit that referenced this pull request Jan 20, 2021
@shwstppr @yadvr
offering: update offering form should allow domain option (#305)
c170ec4 
Fixes: #301
Fixes: #302
Fixes: #303

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vadimkim @asfbot @yadvr