@vesense, I see all 3 files are in trunk, maybe you can up-merge your local repository first?
On Wed, Dec 2, 2015 at 10:10 AM, darionyaphet <g...@git.apache.org> wrote: > Github user darionyaphet commented on the pull request: > > https://github.com/apache/storm/pull/909#issuecomment-161156921 > > it's same with [#908](https://github.com/apache/storm/pull/908) ? If > they are the same, please close this PR . > > > --- > 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. > --- >
