Merging from default

changeset: 2520:69bea3f55a3a tag: tip parent: 2518:df4167d69aa6 user: Ben Hearsum <bhearsum@mozilla.com> date: Tue Aug 21 13:54:25 2012 -0400 summary: bug 773290: multiple partial MAR support in release automation. r=rail --HG-- branch : production-0.8
mozilla-releng · Aug 21, 2012 · a0201b2 · a0201b2
2 parents 589cc38 + ee033ab
commit a0201b2
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 1,042 deletions.
diff --git a/env.py b/env.py
@@ -72,7 +72,6 @@
 
 MozillaEnvironments['linux-unittest'] = {
     "MOZ_NO_REMOTE": '1',
-    "CVS_RSH": 'ssh',
     "DISPLAY": ':2',
     "NO_FAIL_ON_TEST_ERRORS": '1',
     "CCACHE_DIR": '/builds/ccache',
@@ -89,7 +88,6 @@
     "MOZ_NO_REMOTE": '1',
     "NO_EM_RESTART": '1',
     "XPCOM_DEBUG_BREAK": 'warn',
-    "CVS_RSH": 'ssh',
     "NO_FAIL_ON_TEST_ERRORS": '1',
     "MOZ_HIDE_RESULTS_TABLE": '1'
 }
@@ -108,7 +106,6 @@
     "MOZILLABUILDDRIVE": 'C:',
     "MOZILLABUILDPATH": '\\mozilla-build\\',
     "MOZ_TOOLS": 'D:\\mozilla-build\\moztools',
-    "CVS_RSH": 'ssh',
     "NO_FAIL_ON_TEST_ERRORS": '1',
     "VSINSTALLDIR": 'D:\\msvs8',
     "VCINSTALLDIR": 'D:\\msvs8\\VC',
@@ -127,7 +124,6 @@
     "NO_EM_RESTART": '1',
     "MOZ_CRASHREPORTER_NO_REPORT": '1',
     "XPCOM_DEBUG_BREAK": 'warn',
-    "CVS_RSH": 'ssh',
     "NO_FAIL_ON_TEST_ERRORS": '1',
     "MOZ_HIDE_RESULTS_TABLE": '1'
 }