[zorg] r272950 - Allow merge build requests for builder llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast as temporally solution.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Thu Jun 16 15:20:53 2016
New Revision: 272950

URL: http://llvm.org/viewvc/llvm-project?rev=272950&view=rev
Log:
Allow merge build requests for builder llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast as temporally solution.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=272950&r1=272949&r2=272950&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jun 16 15:20:53 2016
@@ -117,7 +117,7 @@ def _get_clang_fast_builders():
                      env={'PATH':'/opt/llvm_37/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'})},
 
         {'name': "llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast",
-         'mergeRequests': False,
+         'mergeRequests': True,
          'slavenames': ["ps4-buildslave2"],
          'builddir': "llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast",
          'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(