Merge bugs 918932, 922858, and 933918 to production.
Fix bad syntax.
Fix bad syntax.
Bug 856017: apply actually create .tmp files, and ignore them in rsync; r=callek
Merge default -> production
Bug 870414 - setup scheduler manifests in puppetAgain. r=dustin
Merging from default

changeset:   1096:b1a992ffcc4d
tag:         tip
parent:      1094:f405b1ce2536
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Nov 11 16:36:12 2013 -0500
summary:     Bug 870414 - setup scheduler manifests in puppetAgain. r=dustin
Bug 933918 - Deploy patched version of the Android SDK to talos-linux64-ix hosts. r=dustin
Merge default to production.

changeset:   1098:fc2ecae4cb7a
tag:         tip
parent:      1096:b1a992ffcc4d
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Nov 12 11:23:41 2013 -0500
summary:     Bug 933918 - Deploy patched version of the Android SDK to talos-linux64-ix hosts. r=dustin
Backout for bug 933918. r=backout
Merge default to production

changeset:   1100:15abecd612c1
tag:         tip
parent:      1098:fc2ecae4cb7a
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Nov 12 11:39:28 2013 -0500
summary:     Backout for bug 933918. r=backout
Bug 933918 - Deploy newer Android SDK to Ubuntu 64-bit hosts (in-house and EC2). r=dustin
changeset:   1102:7878211bd7c3
tag:         tip
parent:      1100:15abecd612c1
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Wed Nov 13 10:29:36 2013 -0500
summary:     Bug 933918 - Deploy newer Android SDK to Ubuntu 64-bit hosts (in-house and EC2). r=dustin
Bug 937888: update check_file_age definition in releng nrpe.cfg; p=ericz, r=me
Merge default -> production
Bug 792836: add a slavealloc extsync; r=Callek
Merge default -> production
Bug938739: set collectd queue size limit to 6000; r=dustin
Merge default -> production
Bug 870853: move collectd include to toplevel::base; r=dustin