Skip to content

[Console][2.7] Fix merge #17040 #17121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2015
Merged

[Console][2.7] Fix merge #17040 #17121

merged 1 commit into from
Dec 23, 2015

Conversation

ogizanagi
Copy link
Contributor

Q A
Fixed tickets 6a92f4e#commitcomment-15080872
License MIT

This change should not be merged in upper branches.

@@ -631,7 +631,7 @@ public function asXml($namespace = null, $asDom = false)
*/
public function renderException($e, $output)
{
$output->writeln('', OutputInterface::VERBOSITY_QUIET);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so this should be removed in 2.7 but re-added/kept on 2.8?

@nicolas-grekas
Copy link
Member

Thank you @ogizanagi.

@nicolas-grekas nicolas-grekas merged commit 211d589 into symfony:2.7 Dec 23, 2015
nicolas-grekas added a commit that referenced this pull request Dec 23, 2015
This PR was merged into the 2.7 branch.

Discussion
----------

[Console][2.7] Fix merge #17040

| Q             | A
| ------------- | ---
| Fixed tickets | 6a92f4e#commitcomment-15080872
| License       | MIT

This change should not be merged in upper branches.

Commits
-------

211d589 [Console][2.7] Fix merge #17040
@ogizanagi ogizanagi deleted the 2.7_fix_merge_17040 branch December 23, 2015 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants