Phase2 shashlik05

[bsunanda]

Add cfi and cff files in Geometry/CMSCommonData and Configuration/Geometry

[cmsbuild]

A new Pull Request was created by @bsunanda for CMSSW_6_2_X_SLHC.

Phase2 shashlik05

It involves the following packages:

Configuration/Geometry
DataFormats/EcalDetId
Geometry/CMSCommonData
Geometry/HGCalCommonData
Geometry/Records
SimG4CMS/Calo
Validation/CheckOverlap

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please review it and eventually sign? Thanks.
@ghellwig, @argiro this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@andersonjacob, @mark-grimes you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[mark-grimes]

Tested together with #2892 and #2990. Everything appears fine. I'll hold off merging until Geometry etcetera have a chance to look at it.
Tests 10000, 10200, 10400, 11200, 11400, 11600, 11800, 12000, 12800 and 13000 pass all steps.
Tests 12200, 12400, 12600, 13200 and 13400 fail in step 2 with known errors.

[ianna]

+1

[ianna]

+1

[ktf]

mmm... it does not merge...can you please rebase?

[mark-grimes]

Really? I don't get any problems at all, either directly on the Integration Build or on the head with everything else merged so far today. I'll try in the morning on the next Integration Build.

[ktf]

Ok, let me know if you still have problems.

[mark-grimes]

@ktf could you close this please? The rebase has merged successfully. Also #2976 which is the same thing minus one commit.