updated the HCAL logical map code to reflect the change in HO ring-0 interface cards, installed during LS1
Migration to 'getbyToken', part I.
Migration to 'getByToken', part I.
Roll-back to resolve conflict.
Merged 70X-consumesMigration-I from repository vadler
Merge branch 'CMSSW_7_0_X' of https://github.com/cms-sw/cmssw into from-CMSSW_7_0_X_2013-10-18-0200
Reapply migration after conflict resolution.
Fix helper classes.
Make static cache thread_local.
Remove unneeded statics.
Remove / make const a few more statics.
Update autoCond.py
Conflict solved

Updated all MC GTs migrating all tags to production. Updated HCAL conditions for SiPM photodetectors. Introduced GEM in DES19 GT.
Conflicts:
	Configuration/AlCa/python/autoCond.py
Update autoCond.py

Updated all MC GTs migrating all tags to production. Updated HCAL conditions for SiPM photodetectors. Introduced GEM in DES19 GT.
Requires the pull request abdoulline:HO_post-LS1 with software changes for the SiPM upgrade.
Remove statics
New accessor for L1 prescales in case of a complex Boolean L1 expression as L1 seed (HLTConfigProvider)
New accessor for L1 prescales in case of a complex Boolean L1 expression as L1 seed (HLTConfigProvider)
Remove statics.
change Tracer::dumpContextForLabel into a vstring
change the parameter name to dumpContextForLabels and the internal data structure from std::vector<std::string> to std::set<std::string> to avoid the linear lookup
Merge pull request #1168 from fwyzard/Tracer_dumpContextForLabel_vstring

Multithreaded framework -- change Tracer::dumpContextForLabel into a vstring