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

2015-05-26 Thread Rajani Karuturi
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 On Tue, May 26, 2015 at 2:45 PM, Vadim Kimlaychuk wrote: > Rohit, > >

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

2015-05-26 Thread Vadim Kimlaychuk
Rohit, I have merged my local branch with master and resolved conflicts. Pull request showed modifications that I have made precisely. But when I created the request it contains multiple files (not just those I have changed). Please review this. I think I have done something wrong agai