Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Updated monolog version in composer.json #305

Merged
merged 1 commit into from

4 participants

@jeremyFreeAgent

No description provided.

@hhamon
Collaborator

Nice one, thanks :)

@jeremyFreeAgent

Lol that is only the beginning ! I'm back in town !

@willdurand
Owner

Thing is, Propel2 is broken because of a change in travis-ci (MySQL safe mode now enabled by default).

@jeremyFreeAgent

Yes, so the test database is created by MySQL.

@jeremyFreeAgent

What the fuck with my PR ? Only composer.json should be on it :(

@jaugustin
Collaborator

rebase your branch with the propel2/master or made a new one with your composer change ;)

@jeremyFreeAgent

This is what I've done last time... I will check that thing... Thanks Jérémie !

@jeremyFreeAgent

So I had to remove the branch, now it's ok !

@jaugustin
Collaborator

@willdurand will merge your PR :)

@jeremyFreeAgent

Yeah ! :D

@willdurand
Owner

Great, thank you and sorry for the delay..

@willdurand willdurand merged commit fc3d524 into from
@jeremyFreeAgent

No problem !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 3, 2012
  1. @jeremyFreeAgent
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  composer.json
View
2  composer.json
@@ -19,7 +19,7 @@
"php": ">=5.4",
"symfony/yaml": "2.1.*",
"symfony/console": "2.1.*",
- "monolog/monolog": "1.0.*",
+ "monolog/monolog": "1.2.*",
"symfony/finder": "2.1.*",
"symfony/validator": "2.1.*",
"symfony/filesystem": "2.1.*"
Something went wrong with that request. Please try again.