Ddc 1385

[ehabinl]

I added a new feature for cache grouping, so please can you merge to the master branch

[stof]

Why are you including @beberlei's commits in your branch ? They are part of a WIP branch (see #151) so I don't see why you should request a merge into master for them

[stof]

Other point: your commit does not follow the Doctrine coding standards

[stof]

btw, I don't see what is the relation between your change and DDC-1385

[ehabinl]

mmmm. I am sorry, This is my first time contributing with doctrine, but I am trying :)

[ehabinl]

I only change one file "lib/Doctrine/ORM/AbstractQuery.php"
so I think I did something wrong :(

[stof]

It seems like you created your branch based on the WIP branch instead of the master branch.

Regarding coding standards, you need to use 4 spaces per level, not tabs.

[beberlei]

You can try to start over by doing the following in your terminal:

git checkout master
git checkout -bQueryCacheTags
git cherry-pick a316c63     
git cherry-pick b2921c6
git push origin QueryCacheTags

[ehabinl]

Thanks Beberlei, I did that :)

[beberlei]

Closing this.