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 <vadim.kimlayc...@elion.ee > wrote: > 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 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.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 https://github.com/vadimkim/cloudstack master > > Alternatively you can review and apply these changes as the patch at: > > https://github.com/apache/cloudstack/pull/302.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 #302 > > ---- > commit 7ee9b1042f35a2998217d973b5ee447ca68497fb > Author: Vadim Kimlaychuk <va...@ant.ee> > Date: 2015-05-20T19:08:29Z > > CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules > > commit a064911d440170185b69001deb28b8b2173b4d05 > Author: Vadim Kimlaychuk <va...@ant.ee> > Date: 2015-05-21T07:18:41Z > > CLOUDSTACK-8231: fixed call to getLbAlgorithms() function in order to > merge results from static and dynamic data > > commit 7abf21f9c8a80dd9bf42c564f9eb56f0a6f9d7cf > Author: Vadim Kimlaychuk <va...@ant.ee> > Date: 2015-05-21T07:44:20Z > > CLOUDSTACK-8231: reverted 7ee9b1042 commit logic > > commit ff31d1f20bc2ef05c82ab10556ee8cf274a39a84 > Author: Vadim Kimlaychuk <va...@ant.ee> > Date: 2015-05-26T09:06:27Z > > Merge remote-tracking branch 'upstream/master' > > Conflicts: > ui/scripts/network.js > > ---- > > > --- > 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 infrastruct...@apache.org or > file a JIRA ticket with INFRA. > --- >
