Bug 973003 - add 10.26.48.25 AKA dev-master1 to list of signing_new_token_allowed_ips, r=bhearsum
merging default -> production

--HG--
branch : production
Bug 969689: Update hgtool from upstream. r=me
Bug 971883: remove vmem from collectd and add cpu aggregation; r=dustin
Merge default -> production

--HG--
branch : production
Bug 971780 - Add new test master defs to puppet, to instantiate. r=armenmzg

--HG--
extra : rebase_source : 5916473005a965a0c6518c45f78f5ee48db33c2d
Merge from default

--HG--
branch : production
bustage fix for Bug 856594: Manage buildbot.tac with puppet -- adds a proper require
Merge bustage fix

--HG--
branch : production
Bug 975004 - Grant pkewisch access to dev-master1. r=callek
Merge default->production

--HG--
branch : production
Bug 803764 - Add mock-hw slave class - r=Callek
Bug 973063 - Schedule multimedia b2g mochitests for emulator-jb on Cedar. r=Callek
changeset:   1386:9e3124c6d6b3
parent:      1384:5fc8f222bfe6
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Thu Feb 20 17:57:01 2014 -0500
summary:     Bug 803764 - Add mock-hw slave class - r=Callek

changeset:   1387:1de340775d97
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri Feb 21 09:09:21 2014 -0500
summary:     Bug 973063 - Schedule multimedia b2g mochitests for emulator-jb on Cedar. r=Callek

--HG--
branch : production
Bug 899969: Enable b2g bumping for v1.3 too. r=bhearsum
merged from default

changeset:   1389:143dcde7e538
tag:         tip
parent:      1387:1de340775d97
user:        Chris AtLee <catlee@mozilla.com>
date:        Fri Feb 21 10:10:15 2014 -0500
summary:     Bug 899969: Enable b2g bumping for v1.3 too. r=bhearsum

--HG--
branch : production
remove openstack, change toplevel class for hp1; a=orgonly
Merge default -> production

--HG--
branch : production
Bug 975678, increase file size limit for mar files to make linux+mac mar signing possible, r=catlee
Merge default -> production

--HG--
branch : production