mozilla-inbound: changeset 275590:955bd1d9ae21a8491b836c6f4ca463496f10f32d

author	Jordan Lund <jlund@mozilla.com>
	Thu, 03 Dec 2015 19:54:48 -0800
changeset 275590	955bd1d9ae21a8491b836c6f4ca463496f10f32d
parent 275589	3021d7cf0c80ef566ef80eea82f43074d2036757
child 275591	ddf13e6aa97ef9585b9d06deab3ee9b1e0ce81d3
push id	68885
push user	jlund@mozilla.com
push date	Fri, 04 Dec 2015 03:55:05 +0000
treeherder	mozilla-inbound@955bd1d9ae21 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	rail
bugs	1206668
milestone	45.0a1
first release with	nightly linux32 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly linux64 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly mac e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly win32 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files nightly win64 e02b17a2b5b8 / 45.0a1 / 20151204030208 / files
last release without	nightly linux32 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly linux64 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly mac 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly win32 85cf2e720a84 / 45.0a1 / 20151203053521 / files nightly win64 85cf2e720a84 / 45.0a1 / 20151203053521 / files

--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -1,15 +1,14 @@
 config = {
     "log_name": "beta_to_release",
     "version_files": [
         "browser/config/version.txt",
         "browser/config/version_display.txt",
         "config/milestone.txt",
-        "mobile/android/confvars.sh",  # TODO: remove this line before gecko 43 merge
         "b2g/confvars.sh",
     ],
     "replacements": [
         # File, from, to
         ("{}/{}".format(d, f),
         "ac_add_options --with-branding=mobile/android/branding/beta",
         "ac_add_options --with-branding=mobile/android/branding/official")
         for d in ["mobile/android/config/mozconfigs/android-api-11/",