Merging from default

changeset:   1867:e4d5f77e430e
parent:      1864:c79fec8e3151
user:        Dustin J. Mitchell <dustin@mozilla.com>
date:        Thu Jun 19 12:28:56 2014 -0400
summary:     Bug 1014047: fix typo; a=bustage

changeset:   1870:d8ea9f99f90a
parent:      1867:e4d5f77e430e
parent:      1869:7935eae6c7e2
user:        Dustin J. Mitchell <dustin@mozilla.com>
date:        Thu Jun 19 15:26:04 2014 -0400
summary:     Merge production -> default

changeset:   1871:8fab8e1860ea
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Thu Jun 19 15:29:14 2014 -0400
summary:     Bug 1027134 - manage_instance_storage.py should consider root  volume size. r=catlee

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merging from default

changeset:   1891:7fad8a14311f
parent:      1889:e302cff585a7
user:        Mike Shal <mshal@mozilla.com>
date:        Thu Jun 19 11:46:28 2014 -0400
summary:     Bug 988785 - new tooltool deployment; r=rail

changeset:   1892:5571df96e3c6
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Fri Jun 20 14:42:23 2014 -0400
summary:     Bug 1023477 - reduce EBS writes by tweaking writeout. r=dustin

--HG--
branch : production
merging default -> production

--HG--
branch : production
Merge default --> production

--HG--
branch : production
Bug 1027134 - manage_instance_storage.py should consider root  volume size. r=catlee
Merging from default

changeset:   1899:6aa41db61598
tag:         tip
parent:      1897:235fff2ff8bd
user:        Rail Aliiev <rail@mozilla.com>
date:        Tue Jun 24 10:51:54 2014 -0400
summary:     Bug 1027134 - manage_instance_storage.py should consider root  volume size. r=catlee

--HG--
branch : production
Bug 712206: slave pre-flight tasks. r=dustin
merged from default

changeset:   1901:18f69cf321cf
tag:         tip
parent:      1899:6aa41db61598
user:        Ian Connolly <iconnolly@mozilla.com>
date:        Tue Jun 24 13:47:16 2014 -0400
summary:     Bug 712206: slave pre-flight tasks. r=dustin

--HG--
branch : production
Bug 1014047: use directory environments, with a long environment_timeout; r=Callek

This is a re-landing, with environment_timeout changed from 10s to 600s
on the hypothesis that the short timeout was behind the performance
issues.

Note that this makes existing user environments invalid, as they are
located at /etc/puppet/environments/$user/env/, and the "env/" suffix
is not compatible with directory environments.
Merge default -> production

--HG--
branch : production
Bug 1014047: fix typo, again; a=bustage

--HG--
branch : production
Bug 1014047: ugh, spelling; a=bustage

--HG--
branch : production
Merge production -> default
Merge branch 'master' into slaveapi_aws