Bug 969261 - Add host db1.qa.scl3.mozilla.com. a=org-only
For testing purposes revert QA notification email to Henrik Skupin
Bug 969261: add team_moc to QA admin_users; a=orgonly
No bug: add ericz's newer key
Add Mac Mini for testing deploystudio. a=org-only

--HG--
extra : rebase_source : a611bde0e40b14b0009ad2c5f40667c3ec4c3a2e
Bug 997721 - Add support for proxy environment variables on Ubuntu and OS X. r=dustin
Bug 997721 - Add dedicated node definitions for QA Mozmill nodes. r=dustin

--HG--
rename : modules/toplevel/manifests/slave.pp => modules/toplevel/manifests/slave/releng.pp
rename : modules/toplevel/manifests/slave/build.pp => modules/toplevel/manifests/slave/releng/build.pp
rename : modules/toplevel/manifests/slave/build/mock.pp => modules/toplevel/manifests/slave/releng/build/mock.pp
rename : modules/toplevel/manifests/slave/build/standard.pp => modules/toplevel/manifests/slave/releng/build/standard.pp
rename : modules/toplevel/manifests/slave/test.pp => modules/toplevel/manifests/slave/releng/test.pp
rename : modules/toplevel/manifests/slave/test/gpu.pp => modules/toplevel/manifests/slave/releng/test/gpu.pp
rename : modules/toplevel/manifests/slave/test/headless.pp => modules/toplevel/manifests/slave/releng/test/headless.pp
Re-add accidentally removed db1.qa.scl3.mozilla.com host. a=org-only
Bug 1020659 - Add 'staging' ascpect for staging nodes. a=org-only
Bug 1021720 - Upgrade mercurial for puppetmaster to version 2.5.4. r=dustin
Remove accidentally added testing boxes. a=org-only
Bug 1013981 - Add TPS CI nodes to QA config. r=dustin
Merge build/default to qa/default

--HG--
rename : modules/toplevel/manifests/slave/build/standard.pp => modules/toplevel/manifests/slave/releng/build/standard.pp
merge qa/default into build/default

--HG--
rename : modules/toplevel/manifests/slave/build.pp => modules/toplevel/manifests/slave/releng/build.pp
rename : modules/toplevel/manifests/slave/build/mock.pp => modules/toplevel/manifests/slave/releng/build/mock.pp
Merge default -> production

--HG--
branch : production