<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>154667</bug_id>
          
          <creation_ts>2016-02-24 21:24:49 -0800</creation_ts>
          <short_desc>Update twisted version in webkitpy.thirdparty.autoinstalled module.</short_desc>
          <delta_ts>2016-10-31 18:21:00 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>155564</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter>dewei_zhu</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>clopez</cc>
    
    <cc>commit-queue</cc>
    
    <cc>dewei_zhu</cc>
    
    <cc>glenn</cc>
    
    <cc>ossy</cc>
    
    <cc>rniwa</cc>
    
    <cc>saam</cc>
    
    <cc>simon.fraser</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1168019</commentid>
    <comment_count>0</comment_count>
    <who name="">dewei_zhu</who>
    <bug_when>2016-02-24 21:24:49 -0800</bug_when>
    <thetext>Update twisted version in webkitpy.thirdparty.autoinstalled module.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168020</commentid>
    <comment_count>1</comment_count>
      <attachid>272171</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-02-24 21:25:11 -0800</bug_when>
    <thetext>Created attachment 272171
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168021</commentid>
    <comment_count>2</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-02-24 21:26:18 -0800</bug_when>
    <thetext>Attachment 272171 did not pass style-queue:


ERROR: Tools/ChangeLog:1:  ChangeLog entry has no bug number  [changelog/bugnumber] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168022</commentid>
    <comment_count>3</comment_count>
      <attachid>272171</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-02-24 21:30:35 -0800</bug_when>
    <thetext>Comment on attachment 272171
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=272171&amp;action=review

&gt; Tools/ChangeLog:11
&gt; +

As far as I know, only benchmark runner uses twisted module in webkitpy module.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168025</commentid>
    <comment_count>4</comment_count>
      <attachid>272171</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2016-02-24 22:13:23 -0800</bug_when>
    <thetext>Comment on attachment 272171
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=272171&amp;action=review

&gt;&gt; Tools/ChangeLog:11
&gt;&gt; +
&gt; 
&gt; As far as I know, only benchmark runner uses twisted module in webkitpy module.

How can this be confirmed?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168864</commentid>
    <comment_count>5</comment_count>
      <attachid>272171</attachid>
    <who name="Csaba Osztrogonác">ossy</who>
    <bug_when>2016-02-27 05:26:06 -0800</bug_when>
    <thetext>Comment on attachment 272171
Patch

Buildbot master uses an ancient buildbot version, which needs this old twisted. I added exactly this version to autoinstall to be able to run buildbot master.cfg unittest out of the box.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168865</commentid>
    <comment_count>6</comment_count>
    <who name="Csaba Osztrogonác">ossy</who>
    <bug_when>2016-02-27 06:19:02 -0800</bug_when>
    <thetext>See https://bugs.webkit.org/show_bug.cgi?id=142219 for details.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169104</commentid>
    <comment_count>7</comment_count>
    <who name="Csaba Osztrogonác">ossy</who>
    <bug_when>2016-02-29 03:06:48 -0800</bug_when>
    <thetext>Additionally this change is incorrect, because after this 
change autoinstaller still installs the old twisted version:

$ Tools/Scripts/test-webkitpy
Suppressing most webkitpy logging while running unit tests.
Skipping tests in the following modules or packages because they are really, really, slow:
    webkitpy.common.checkout.scm.scm_unittest
    (https://bugs.webkit.org/show_bug.cgi?id=31818; use --all to include)

Checking autoinstalled packages ...Auto-installing package: jinja2
Auto-installing package: sqlalchemy
Auto-installing package: twisted
Auto-installing package: buildbot
Auto-installing package: coverage
Auto-installing package: eliza.py
Auto-installing package: mechanize
Auto-installing package: pep8.py
Auto-installing package: logilab.common
Auto-installing package: logilab.astng
Auto-installing package: pylint
Auto-installing package: twisted

$ cat Tools/Scripts/webkitpy/thirdparty/autoinstalled/twisted/.twisted.url
https://pypi.python.org/packages/source/T/Twisted/Twisted-12.1.0.tar.bz2#md5=f396f1d6f5321e869c2f89b2196a9eb5

The root of this problem is https://trac.webkit.org/changeset/187925
which took no account of already installed twisted by _install_buildbot</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174794</commentid>
    <comment_count>8</comment_count>
      <attachid>274048</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-03-14 16:35:56 -0700</bug_when>
    <thetext>Created attachment 274048
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174795</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-03-14 16:37:23 -0700</bug_when>
    <thetext>Attachment 274048 did not pass style-queue:


ERROR: Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:12:  No name &apos;new_twisted&apos; in module &apos;webkitpy.thirdparty.autoinstalled&apos;  [pylint/E0611] [5]
Total errors found: 1 in 4 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174796</commentid>
    <comment_count>10</comment_count>
      <attachid>274048</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2016-03-14 16:40:08 -0700</bug_when>
    <thetext>Comment on attachment 274048
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=274048&amp;action=review

&gt; Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:-32
&gt; -        reactor.stop()

You should explain this change in the change log.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174805</commentid>
    <comment_count>11</comment_count>
      <attachid>274052</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-03-14 16:48:03 -0700</bug_when>
    <thetext>Created attachment 274052
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174815</commentid>
    <comment_count>12</comment_count>
      <attachid>274052</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2016-03-14 17:04:41 -0700</bug_when>
    <thetext>Comment on attachment 274052
Patch for landing

View in context: https://bugs.webkit.org/attachment.cgi?id=274052&amp;action=review

&gt; Tools/ChangeLog:8
&gt; +        Add lasted twisted to webkitpy.thirdparty.autoinstalled.

lasted? latest?

&gt; Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:12
&gt; +    from webkitpy.thirdparty.autoinstalled.new_twisted import twisted

Using &quot;new&quot; in code is a mistake. In a year or two, it&apos;s no longer new and the read doesn&apos;t really know what changed. If it has a version number, say that explicitly.

&gt; Tools/Scripts/webkitpy/thirdparty/__init__.py:160
&gt; +    def _install_new_twisted(self):

Don&apos;t say &quot;new&quot;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174858</commentid>
    <comment_count>13</comment_count>
      <attachid>274062</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-03-14 18:38:35 -0700</bug_when>
    <thetext>Created attachment 274062
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1174859</commentid>
    <comment_count>14</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-03-14 18:40:58 -0700</bug_when>
    <thetext>Attachment 274062 did not pass style-queue:


ERROR: Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:12:  No name &apos;twisted_15_5_0&apos; in module &apos;webkitpy.thirdparty.autoinstalled&apos;  [pylint/E0611] [5]
Total errors found: 1 in 4 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1175624</commentid>
    <comment_count>15</comment_count>
      <attachid>274062</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2016-03-16 20:28:46 -0700</bug_when>
    <thetext>Comment on attachment 274062
Patch

Clearing r+ flag, since this has been landed and rolled out.

Additionally, it&apos;s not clear from bug comments if Ossy&apos;s concerns have been addressed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1238691</commentid>
    <comment_count>16</comment_count>
      <attachid>291211</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-10-10 19:27:59 -0700</bug_when>
    <thetext>Created attachment 291211
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1238936</commentid>
    <comment_count>17</comment_count>
    <who name="Saam Barati">saam</who>
    <bug_when>2016-10-11 12:02:08 -0700</bug_when>
    <thetext>*** Bug 163261 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1244042</commentid>
    <comment_count>18</comment_count>
    <who name="">dewei_zhu</who>
    <bug_when>2016-10-24 19:05:29 -0700</bug_when>
    <thetext>(In reply to comment #6)
&gt; See https://bugs.webkit.org/show_bug.cgi?id=142219 for details.

Updated the patch. Could you take a look? Thanks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1244506</commentid>
    <comment_count>19</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2016-10-25 15:54:25 -0700</bug_when>
    <thetext>I have tested this. It works fine on the GTK+ platform.

But I see that it won&apos;t auto-install twisted 15.0 or use it if the system already has python-twisted installed.

If you want to ensure this script always uses twisted 15.0 you can try something like:


--- a/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py
+++ b/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py
@@ -5,11 +5,8 @@ import logging
 import os
 import sys
 
-try:
-    import twisted
-except ImportError:
-    sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), &apos;../../../..&apos;)))
-    from webkitpy.thirdparty.autoinstalled.twisted import twisted
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), &apos;../../../..&apos;)))
+from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted
 
 from twisted.web import static, server
 from twisted.web.resource import Resource




By the way.. what is the context for requiring twisted 15.0 here?
Is it necessary for some run-benchmark test?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1246088</commentid>
    <comment_count>20</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2016-10-29 14:19:29 -0700</bug_when>
    <thetext>(In reply to comment #19)
&gt;
&gt; By the way.. what is the context for requiring twisted 15.0 here?
&gt; Is it necessary for some run-benchmark test?

Yeah, older versions of twisted has a bug whereby which some benchmark page fails to load.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1246098</commentid>
    <comment_count>21</comment_count>
    <who name="">dewei_zhu</who>
    <bug_when>2016-10-29 15:25:52 -0700</bug_when>
    <thetext>(In reply to comment #19)
&gt; I have tested this. It works fine on the GTK+ platform.
&gt; 
&gt; But I see that it won&apos;t auto-install twisted 15.0 or use it if the system
&gt; already has python-twisted installed.
&gt; 
&gt; If you want to ensure this script always uses twisted 15.0 you can try
&gt; something like:
&gt; 
&gt; 
&gt; ---
&gt; a/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/
&gt; twisted_http_server.py
&gt; +++
&gt; b/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/
&gt; twisted_http_server.py
&gt; @@ -5,11 +5,8 @@ import logging
&gt;  import os
&gt;  import sys
&gt;  
&gt; -try:
&gt; -    import twisted
&gt; -except ImportError:
&gt; -   
&gt; sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.
&gt; abspath(__file__)), &apos;../../../..&apos;)))
&gt; -    from webkitpy.thirdparty.autoinstalled.twisted import twisted
&gt; +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.
&gt; abspath(__file__)), &apos;../../../..&apos;)))
&gt; +from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted
&gt;  
&gt;  from twisted.web import static, server
&gt;  from twisted.web.resource import Resource
That sounds good to me. I think it&apos;s even better to check the version of twisted, if it is a version earlier than 15.5.0(this version is working for sure), we should always use autoinstalled module in webkitpy.thirdparty.
&gt; 
&gt; 
&gt; 
&gt; 
&gt; By the way.. what is the context for requiring twisted 15.0 here?
&gt; Is it necessary for some run-benchmark test?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1246658</commentid>
    <comment_count>22</comment_count>
      <attachid>293481</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-10-31 16:02:49 -0700</bug_when>
    <thetext>Created attachment 293481
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1246746</commentid>
    <comment_count>23</comment_count>
      <attachid>293504</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2016-10-31 17:44:34 -0700</bug_when>
    <thetext>Created attachment 293504
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1246760</commentid>
    <comment_count>24</comment_count>
      <attachid>293504</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-10-31 18:20:54 -0700</bug_when>
    <thetext>Comment on attachment 293504
Patch for landing

Clearing flags on attachment: 293504

Committed r208205: &lt;http://trac.webkit.org/changeset/208205&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1246761</commentid>
    <comment_count>25</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-10-31 18:21:00 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272171</attachid>
            <date>2016-02-24 21:25:11 -0800</date>
            <delta_ts>2016-03-14 16:35:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154667-20160224212453.patch</filename>
            <type>text/plain</type>
            <size>1874</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3MDYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWEwNDRhMjM5ZGZiNDNhZjgwNWQ0NGM0NDY3ZDI4ODBm
YTY2ZDI4My4uMmEwNGFjZmYzMDJkNTE4N2I4ZWUwMjE2ZDM1MDBlNDM5YjIyNWU4ZSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0
IEBACisyMDE2LTAyLTI0ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIFVwZGF0ZSB0d2lzdGVkIHZlcnNpb24gaW4gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5z
dGFsbGVkLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFVwZGF0ZSB0d2lzdGVkIHByb3ZpZGVkIGJ5IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3Rh
bGxlZCB0byBmaXggdGhlIGJ1ZyBpbiBvbGQgdmVyc2lvbiBvZiB0d2lzdGVkIHdoaWNoIGZhaWxz
IGFuaW1vbWV0ZXIgdGVzdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0
eS9fX2luaXRfXy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF90
d2lzdGVkKToKKwogMjAxNi0wMi0yNCAgTmlrb3MgQW5kcm9uaWtvcyAgPG5pa29zLmFuZHJvbmlr
b3Mtd2Via2l0QGNpc3JhLmNhbm9uLmNvbS5hdT4KIAogICAgICAgICBbd2ViLWFuaW1hdGlvbnNd
IEFkZCBBbmltYXRpb25UaW1lbGluZSwgRG9jdW1lbnRUaW1lbGluZSBhbmQgYWRkIGV4dGVuc2lv
bnMgdG8gRG9jdW1lbnQgaW50ZXJmYWNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp
dHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJk
cGFydHkvX19pbml0X18ucHkKaW5kZXggZjQzYzNhY2FkODlkMWMxODFhZmI0NWMzOTE2ZjJjZjkx
YjZmYjg1OS4uNGUxODljOTBlYzdhMGQzZThjNjM2NDg4OTJmZjc1ZmRmY2M2NzMwZiAxMDA2NDQK
LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CisrKyBi
L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQpAQCAtMTUzLDcg
KzE1Myw3IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgIGRlZiBf
aW5zdGFsbF90d2lzdGVkKHNlbGYpOgogICAgICAgICB0d2lzdGVkX2RpciA9IHNlbGYuX2ZzLmpv
aW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdpc3RlZCIpCiAgICAgICAgIGluc3RhbGxlciA9IEF1
dG9JbnN0YWxsZXIocHJlcGVuZF90b19zZWFyY2hfcGF0aD1UcnVlLCB0YXJnZXRfZGlyPXR3aXN0
ZWRfZGlyKQotICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBzOi8vcHlwaS5weXRo
b24ub3JnL3BhY2thZ2VzL3NvdXJjZS9UL1R3aXN0ZWQvVHdpc3RlZC0xMi4xLjAudGFyLmJ6MiNt
ZDU9ZjM5NmYxZDZmNTMyMWU4NjljMmY4OWIyMTk2YTllYjUiLCB1cmxfc3VicGF0aD0iVHdpc3Rl
ZC0xMi4xLjAvdHdpc3RlZCIpCisgICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6
Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL1QvVHdpc3RlZC9Ud2lzdGVkLTE1LjUu
MC50YXIuYnoyI21kNT0wODMxZDdjOTBkMDAyMDA2MmRlMGY3Mjg3NTMwYTI4NSIsIHVybF9zdWJw
YXRoPSJUd2lzdGVkLTE1LjUuMC90d2lzdGVkIikKIAogICAgIGRlZiBfaW5zdGFsbChzZWxmLCB1
cmwsIHVybF9zdWJwYXRoPU5vbmUsIHRhcmdldF9uYW1lPU5vbmUpOgogICAgICAgICBpbnN0YWxs
ZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9X0FVVE9JTlNUQUxMRURfRElSKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>274048</attachid>
            <date>2016-03-14 16:35:56 -0700</date>
            <delta_ts>2016-03-14 16:47:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154667-20160314163545.patch</filename>
            <type>text/plain</type>
            <size>4478</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzU1ZmQzNTJmZWExMzUxNWY1YThmMDQ4YTUzN2M2Yzhm
OTFmMDJmYS4uMTcwMWU5MWQzODU2YmFkODUxMWY5NGUzODVkYTZmMTI5MzZiNDAwZiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx
IEBACisyMDE2LTAzLTE0ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIEFkZCBhIG5ldyB0d2lzdGVkIG1vZHVsZSB0byB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9p
bnN0YWxsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xNTQ2NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBBZGQgbGFzdGVkIHR3aXN0ZWQgdG8gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVk
LgorICAgICAgICBNaW5vciBmaXggZm9yIHR3c2l0ZWRfaHR0cF9zZXJ2ZXIgdXNlZCBieSBydW4t
YmVuY2htYXJrLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy
L2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5Ogor
ICAgICAgICAoU2VydmVyQ29udHJvbC5yZW5kZXJfUE9TVCk6IERlbGV0ZWQuCisgICAgICAgICog
U2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAgICAoQXV0b2lu
c3RhbGxJbXBvcnRIb29rLmZpbmRfbW9kdWxlKToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0
SG9vay5faW5zdGFsbF9uZXdfdHdpc3RlZCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90
aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGhpcmRwYXJ0eVRlc3Qu
dGVzdF9pbXBvcnRzKToKKwogMjAxNi0wMy0xNCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5j
b20+CiAKICAgICAgICAgTmVlZCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIFN5bWJvbCgpIGFuZCBT
eW1ib2woIiIpLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf
cnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVy
LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVy
X2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5CmluZGV4IDk3ZjI4NDhk
N2M0MWQzODRhNmU2NTk0YjYwZWNmM2NiYTZkZTEzODQuLmE1ZmI0ZGFhNzk4MDRlMDE1NDEzMjVh
MzI0MzcxZTdiNmI4ZmZhMTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu
Y2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRw
X3NlcnZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv
aHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkKQEAg
LTksNyArOSw3IEBAIHRyeToKICAgICBpbXBvcnQgdHdpc3RlZAogZXhjZXB0IEltcG9ydEVycm9y
OgogICAgIHN5cy5wYXRoLmFwcGVuZChvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKG9zLnBh
dGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxlX18pKSwgJy4uLy4uLy4uLy4uJykpKQot
ICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnR3aXN0ZWQgaW1wb3J0
IHR3aXN0ZWQKKyAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5uZXdf
dHdpc3RlZCBpbXBvcnQgdHdpc3RlZAogCiBmcm9tIHR3aXN0ZWQud2ViIGltcG9ydCBzdGF0aWMs
IHNlcnZlcgogZnJvbSB0d2lzdGVkLndlYi5yZXNvdXJjZSBpbXBvcnQgUmVzb3VyY2UKQEAgLTI5
LDcgKzI5LDYgQEAgY2xhc3MgU2VydmVyQ29udHJvbChSZXNvdXJjZSk6CiAgICAgICAgIF9sb2cu
aW5mbygiU2VydmluZyByZXF1ZXN0ICVzIiAlIHJlcXVlc3QpCiAgICAgICAgIHN5cy5zdGRvdXQu
d3JpdGUocmVxdWVzdC5jb250ZW50LmdldHZhbHVlKCkpCiAgICAgICAgIHN5cy5zdGRvdXQuZmx1
c2goKQotICAgICAgICByZWFjdG9yLnN0b3AoKQogICAgICAgICByZXR1cm4gJ09LJwogCiAKZGlm
ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weSBi
L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQppbmRleCBmNDNj
M2FjYWQ4OWQxYzE4MWFmYjQ1YzM5MTZmMmNmOTFiNmZiODU5Li4zYzFhMjFlYzdhNDBmMWNkYWFh
YmMyNTc3YjVhOTJhMzEwMTkwNjVlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L3RoaXJkcGFydHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGly
ZHBhcnR5L19faW5pdF9fLnB5CkBAIC05MSw2ICs5MSw4IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1w
b3J0SG9vayhvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9idWlsZGJvdCgpCiAg
ICAgICAgIGVsaWYgJy5rZXlyaW5nJyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2lu
c3RhbGxfa2V5cmluZygpCisgICAgICAgIGVsaWYgJy5uZXdfdHdpc3RlZCcgaW4gZnVsbG5hbWU6
CisgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX25ld190d2lzdGVkKCkKICAgICAgICAgZWxpZiAn
LnR3aXN0ZWQnIGluIGZ1bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF90d2lzdGVk
KCkKIApAQCAtMTU1LDYgKzE1NywxMSBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2Jq
ZWN0KToKICAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcihwcmVwZW5kX3RvX3NlYXJj
aF9wYXRoPVRydWUsIHRhcmdldF9kaXI9dHdpc3RlZF9kaXIpCiAgICAgICAgIGluc3RhbGxlci5p
bnN0YWxsKHVybD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL1QvVHdp
c3RlZC9Ud2lzdGVkLTEyLjEuMC50YXIuYnoyI21kNT1mMzk2ZjFkNmY1MzIxZTg2OWMyZjg5YjIx
OTZhOWViNSIsIHVybF9zdWJwYXRoPSJUd2lzdGVkLTEyLjEuMC90d2lzdGVkIikKIAorICAgIGRl
ZiBfaW5zdGFsbF9uZXdfdHdpc3RlZChzZWxmKToKKyAgICAgICAgdHdpc3RlZF9kaXIgPSBzZWxm
Ll9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgIm5ld190d2lzdGVkIikKKyAgICAgICAgaW5z
dGFsbGVyID0gQXV0b0luc3RhbGxlcihwcmVwZW5kX3RvX3NlYXJjaF9wYXRoPVRydWUsIHRhcmdl
dF9kaXI9dHdpc3RlZF9kaXIpCisgICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6
Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL1QvVHdpc3RlZC9Ud2lzdGVkLTE1LjUu
MC50YXIuYnoyI21kNT0wODMxZDdjOTBkMDAyMDA2MmRlMGY3Mjg3NTMwYTI4NSIsIHVybF9zdWJw
YXRoPSJUd2lzdGVkLTE1LjUuMC90d2lzdGVkIikKKwogICAgIGRlZiBfaW5zdGFsbChzZWxmLCB1
cmwsIHVybF9zdWJwYXRoPU5vbmUsIHRhcmdldF9uYW1lPU5vbmUpOgogICAgICAgICBpbnN0YWxs
ZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9X0FVVE9JTlNUQUxMRURfRElSKQogICAgICAg
ICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9dXJsLCB1cmxfc3VicGF0aD11cmxfc3VicGF0aCwgdGFy
Z2V0X25hbWU9dGFyZ2V0X25hbWUpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkKaW5kZXggYTg4ZjYxODU2N2QzZDMyYjYx
NWM1NjBhM2Q2YjAxY2FjNzAyOTZkMi4uMWI2MDkzYWNkNTMzNWZkMWYzZTA1NzNmMTU4NzY4NjI2
MWUxMDU5OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19f
aW5pdF9fX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0
eS9fX2luaXRfX191bml0dGVzdC5weQpAQCAtNjQsMyArNjQsNSBAQCBjbGFzcyBUaGlyZHBhcnR5
VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBh
cnR5LmF1dG9pbnN0YWxsZWQubWVjaGFuaXplCiAgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGly
ZHBhcnR5LmF1dG9pbnN0YWxsZWQucHlsaW50CiAgICAgICAgIGltcG9ydCB3ZWJraXRweS50aGly
ZHBhcnR5LmF1dG9pbnN0YWxsZWQucGVwOAorICAgICAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRw
YXJ0eS5hdXRvaW5zdGFsbGVkLnR3aXN0ZWQKKyAgICAgICAgaW1wb3J0IHdlYmtpdHB5LnRoaXJk
cGFydHkuYXV0b2luc3RhbGxlZC5uZXdfdHdpc3RlZAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>274052</attachid>
            <date>2016-03-14 16:48:03 -0700</date>
            <delta_ts>2016-03-14 18:38:30 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-154667-20160314164751.patch</filename>
            <type>text/plain</type>
            <size>4544</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzU1ZmQzNTJmZWExMzUxNWY1YThmMDQ4YTUzN2M2Yzhm
OTFmMDJmYS4uYzc2MjJmZWZjMDUyODE2Y2IwMjkzZDM0M2U3ZjBjMTZjNDEwZWViNiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx
IEBACisyMDE2LTAzLTE0ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIEFkZCBhIG5ldyB0d2lzdGVkIG1vZHVsZSB0byB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9p
bnN0YWxsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xNTQ2NjcKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAg
QWRkIGxhc3RlZCB0d2lzdGVkIHRvIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC4K
KyAgICAgICAgTWlub3IgZml4IGZvciB0d3NpdGVkX2h0dHBfc2VydmVyIHVzZWQgYnkgcnVuLWJl
bmNobWFyayB0aGF0IHdlIHNob3VsZCBvbmx5IHN0b3AgaHR0cCBzZXJ2ZXIgd2hlbiByZWNpZXZp
bmcgJ0dFVCAvc2h1dGRvd24nLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h
cmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2Vy
dmVyLnB5OgorICAgICAgICAoU2VydmVyQ29udHJvbC5yZW5kZXJfUE9TVCk6IERlbGV0ZWQuCisg
ICAgICAgICogU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAg
ICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLmZpbmRfbW9kdWxlKToKKyAgICAgICAgKEF1dG9pbnN0
YWxsSW1wb3J0SG9vay5faW5zdGFsbF9uZXdfdHdpc3RlZCk6CisgICAgICAgICogU2NyaXB0cy93
ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGhpcmRw
YXJ0eVRlc3QudGVzdF9pbXBvcnRzKToKKwogMjAxNi0wMy0xNCAgTWFyayBMYW0gIDxtYXJrLmxh
bUBhcHBsZS5jb20+CiAKICAgICAgICAgTmVlZCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIFN5bWJv
bCgpIGFuZCBTeW1ib2woIiIpLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i
ZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0
dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0
dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5CmluZGV4
IDk3ZjI4NDhkN2M0MWQzODRhNmU2NTk0YjYwZWNmM2NiYTZkZTEzODQuLmE1ZmI0ZGFhNzk4MDRl
MDE1NDEzMjVhMzI0MzcxZTdiNmI4ZmZhMTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi
a2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdp
c3RlZF9odHRwX3NlcnZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy
a19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2
ZXIucHkKQEAgLTksNyArOSw3IEBAIHRyeToKICAgICBpbXBvcnQgdHdpc3RlZAogZXhjZXB0IElt
cG9ydEVycm9yOgogICAgIHN5cy5wYXRoLmFwcGVuZChvcy5wYXRoLmFic3BhdGgob3MucGF0aC5q
b2luKG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxlX18pKSwgJy4uLy4uLy4u
Ly4uJykpKQotICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnR3aXN0
ZWQgaW1wb3J0IHR3aXN0ZWQKKyAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3Rh
bGxlZC5uZXdfdHdpc3RlZCBpbXBvcnQgdHdpc3RlZAogCiBmcm9tIHR3aXN0ZWQud2ViIGltcG9y
dCBzdGF0aWMsIHNlcnZlcgogZnJvbSB0d2lzdGVkLndlYi5yZXNvdXJjZSBpbXBvcnQgUmVzb3Vy
Y2UKQEAgLTI5LDcgKzI5LDYgQEAgY2xhc3MgU2VydmVyQ29udHJvbChSZXNvdXJjZSk6CiAgICAg
ICAgIF9sb2cuaW5mbygiU2VydmluZyByZXF1ZXN0ICVzIiAlIHJlcXVlc3QpCiAgICAgICAgIHN5
cy5zdGRvdXQud3JpdGUocmVxdWVzdC5jb250ZW50LmdldHZhbHVlKCkpCiAgICAgICAgIHN5cy5z
dGRvdXQuZmx1c2goKQotICAgICAgICByZWFjdG9yLnN0b3AoKQogICAgICAgICByZXR1cm4gJ09L
JwogCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2lu
aXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQpp
bmRleCBmNDNjM2FjYWQ4OWQxYzE4MWFmYjQ1YzM5MTZmMmNmOTFiNmZiODU5Li4zYzFhMjFlYzdh
NDBmMWNkYWFhYmMyNTc3YjVhOTJhMzEwMTkwNjVlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CkBAIC05MSw2ICs5MSw4IEBAIGNsYXNzIEF1dG9p
bnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9idWls
ZGJvdCgpCiAgICAgICAgIGVsaWYgJy5rZXlyaW5nJyBpbiBmdWxsbmFtZToKICAgICAgICAgICAg
IHNlbGYuX2luc3RhbGxfa2V5cmluZygpCisgICAgICAgIGVsaWYgJy5uZXdfdHdpc3RlZCcgaW4g
ZnVsbG5hbWU6CisgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX25ld190d2lzdGVkKCkKICAgICAg
ICAgZWxpZiAnLnR3aXN0ZWQnIGluIGZ1bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5faW5zdGFs
bF90d2lzdGVkKCkKIApAQCAtMTU1LDYgKzE1NywxMSBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9y
dEhvb2sob2JqZWN0KToKICAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcihwcmVwZW5k
X3RvX3NlYXJjaF9wYXRoPVRydWUsIHRhcmdldF9kaXI9dHdpc3RlZF9kaXIpCiAgICAgICAgIGlu
c3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291
cmNlL1QvVHdpc3RlZC9Ud2lzdGVkLTEyLjEuMC50YXIuYnoyI21kNT1mMzk2ZjFkNmY1MzIxZTg2
OWMyZjg5YjIxOTZhOWViNSIsIHVybF9zdWJwYXRoPSJUd2lzdGVkLTEyLjEuMC90d2lzdGVkIikK
IAorICAgIGRlZiBfaW5zdGFsbF9uZXdfdHdpc3RlZChzZWxmKToKKyAgICAgICAgdHdpc3RlZF9k
aXIgPSBzZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgIm5ld190d2lzdGVkIikKKyAg
ICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcihwcmVwZW5kX3RvX3NlYXJjaF9wYXRoPVRy
dWUsIHRhcmdldF9kaXI9dHdpc3RlZF9kaXIpCisgICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVy
bD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL1QvVHdpc3RlZC9Ud2lz
dGVkLTE1LjUuMC50YXIuYnoyI21kNT0wODMxZDdjOTBkMDAyMDA2MmRlMGY3Mjg3NTMwYTI4NSIs
IHVybF9zdWJwYXRoPSJUd2lzdGVkLTE1LjUuMC90d2lzdGVkIikKKwogICAgIGRlZiBfaW5zdGFs
bChzZWxmLCB1cmwsIHVybF9zdWJwYXRoPU5vbmUsIHRhcmdldF9uYW1lPU5vbmUpOgogICAgICAg
ICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9X0FVVE9JTlNUQUxMRURfRElS
KQogICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9dXJsLCB1cmxfc3VicGF0aD11cmxfc3Vi
cGF0aCwgdGFyZ2V0X25hbWU9dGFyZ2V0X25hbWUpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkKaW5kZXggYTg4ZjYxODU2
N2QzZDMyYjYxNWM1NjBhM2Q2YjAxY2FjNzAyOTZkMi4uMWI2MDkzYWNkNTMzNWZkMWYzZTA1NzNm
MTU4NzY4NjI2MWUxMDU5OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGly
ZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv
dGhpcmRwYXJ0eS9fX2luaXRfX191bml0dGVzdC5weQpAQCAtNjQsMyArNjQsNSBAQCBjbGFzcyBU
aGlyZHBhcnR5VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGltcG9ydCB3ZWJraXRw
eS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQubWVjaGFuaXplCiAgICAgICAgIGltcG9ydCB3ZWJr
aXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucHlsaW50CiAgICAgICAgIGltcG9ydCB3ZWJr
aXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucGVwOAorICAgICAgICBpbXBvcnQgd2Via2l0
cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnR3aXN0ZWQKKyAgICAgICAgaW1wb3J0IHdlYmtp
dHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5uZXdfdHdpc3RlZAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>274062</attachid>
            <date>2016-03-14 18:38:35 -0700</date>
            <delta_ts>2016-10-10 19:27:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154667-20160314183823.patch</filename>
            <type>text/plain</type>
            <size>4566</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzU1ZmQzNTJmZWExMzUxNWY1YThmMDQ4YTUzN2M2Yzhm
OTFmMDJmYS4uODA0MjZkZjM1MzhmYzI0MmNkYTQxMjExZTQ4MTlkYjFlNzA0OGNiZSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx
IEBACisyMDE2LTAzLTE0ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIEFkZCB0d2lzdGVkLTE1LjUuMCBtb2R1bGUgdG8gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRv
aW5zdGFsbGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MTU0NjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAg
IEFkZCB0d2lzdGVkLTE1LjUuMCB0byB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQu
CisgICAgICAgIE1pbm9yIGZpeCBmb3IgdHdzaXRlZF9odHRwX3NlcnZlciB1c2VkIGJ5IHJ1bi1i
ZW5jaG1hcmsgdGhhdCB3ZSBzaG91bGQgb25seSBzdG9wIGh0dHAgc2VydmVyIHdoZW4gcmVjaWV2
aW5nICdHRVQgL3NodXRkb3duJy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2ht
YXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRwX3Nl
cnZlci5weToKKyAgICAgICAgKFNlcnZlckNvbnRyb2wucmVuZGVyX1BPU1QpOiBEZWxldGVkLgor
ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weToKKyAgICAg
ICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5maW5kX21vZHVsZSk6CisgICAgICAgIChBdXRvaW5z
dGFsbEltcG9ydEhvb2suX2luc3RhbGxfdHdpc3RlZF8xNV81XzApOgorICAgICAgICAqIFNjcmlw
dHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfX191bml0dGVzdC5weToKKyAgICAgICAgKFRo
aXJkcGFydHlUZXN0LnRlc3RfaW1wb3J0cyk6CisKIDIwMTYtMDMtMTQgIE1hcmsgTGFtICA8bWFy
ay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE5lZWQgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbiBT
eW1ib2woKSBhbmQgU3ltYm9sKCIiKS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0
cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3Rl
ZF9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l
ci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRwX3NlcnZlci5weQpp
bmRleCA5N2YyODQ4ZDdjNDFkMzg0YTZlNjU5NGI2MGVjZjNjYmE2ZGUxMzg0Li5jNWMwMjcxOGNm
ZGIwNmQ4Y2I5NjQ4ODNhMmU2ZmIzZmZjOWNiYjI1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz
L3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVy
L3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j
aG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBf
c2VydmVyLnB5CkBAIC05LDcgKzksNyBAQCB0cnk6CiAgICAgaW1wb3J0IHR3aXN0ZWQKIGV4Y2Vw
dCBJbXBvcnRFcnJvcjoKICAgICBzeXMucGF0aC5hcHBlbmQob3MucGF0aC5hYnNwYXRoKG9zLnBh
dGguam9pbihvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRoKF9fZmlsZV9fKSksICcuLi8u
Li8uLi8uLicpKSkKLSAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC50
d2lzdGVkIGltcG9ydCB0d2lzdGVkCisgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9p
bnN0YWxsZWQudHdpc3RlZF8xNV81XzAgaW1wb3J0IHR3aXN0ZWQKIAogZnJvbSB0d2lzdGVkLndl
YiBpbXBvcnQgc3RhdGljLCBzZXJ2ZXIKIGZyb20gdHdpc3RlZC53ZWIucmVzb3VyY2UgaW1wb3J0
IFJlc291cmNlCkBAIC0yOSw3ICsyOSw2IEBAIGNsYXNzIFNlcnZlckNvbnRyb2woUmVzb3VyY2Up
OgogICAgICAgICBfbG9nLmluZm8oIlNlcnZpbmcgcmVxdWVzdCAlcyIgJSByZXF1ZXN0KQogICAg
ICAgICBzeXMuc3Rkb3V0LndyaXRlKHJlcXVlc3QuY29udGVudC5nZXR2YWx1ZSgpKQogICAgICAg
ICBzeXMuc3Rkb3V0LmZsdXNoKCkKLSAgICAgICAgcmVhY3Rvci5zdG9wKCkKICAgICAgICAgcmV0
dXJuICdPSycKIAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFy
dHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0
X18ucHkKaW5kZXggZjQzYzNhY2FkODlkMWMxODFhZmI0NWMzOTE2ZjJjZjkxYjZmYjg1OS4uNTU3
YzRiNmU4MzA5YmM3ODRlZGZjYmNhNTdjNDc0NzIyNDRmNjE2YSAxMDA2NDQKLS0tIGEvVG9vbHMv
U2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1Njcmlw
dHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQpAQCAtOTEsNiArOTEsOCBAQCBjbGFz
cyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX2luc3Rh
bGxfYnVpbGRib3QoKQogICAgICAgICBlbGlmICcua2V5cmluZycgaW4gZnVsbG5hbWU6CiAgICAg
ICAgICAgICBzZWxmLl9pbnN0YWxsX2tleXJpbmcoKQorICAgICAgICBlbGlmICcudHdpc3RlZF8x
NV81XzAnIGluIGZ1bGxuYW1lOgorICAgICAgICAgICAgc2VsZi5faW5zdGFsbF90d2lzdGVkXzE1
XzVfMCgpCiAgICAgICAgIGVsaWYgJy50d2lzdGVkJyBpbiBmdWxsbmFtZToKICAgICAgICAgICAg
IHNlbGYuX2luc3RhbGxfdHdpc3RlZCgpCiAKQEAgLTE1NSw2ICsxNTcsMTEgQEAgY2xhc3MgQXV0
b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgIGluc3RhbGxlciA9IEF1dG9JbnN0
YWxsZXIocHJlcGVuZF90b19zZWFyY2hfcGF0aD1UcnVlLCB0YXJnZXRfZGlyPXR3aXN0ZWRfZGly
KQogICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBzOi8vcHlwaS5weXRob24ub3Jn
L3BhY2thZ2VzL3NvdXJjZS9UL1R3aXN0ZWQvVHdpc3RlZC0xMi4xLjAudGFyLmJ6MiNtZDU9ZjM5
NmYxZDZmNTMyMWU4NjljMmY4OWIyMTk2YTllYjUiLCB1cmxfc3VicGF0aD0iVHdpc3RlZC0xMi4x
LjAvdHdpc3RlZCIpCiAKKyAgICBkZWYgX2luc3RhbGxfdHdpc3RlZF8xNV81XzAoc2VsZik6Cisg
ICAgICAgIHR3aXN0ZWRfZGlyID0gc2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9ESVIsICJ0
d2lzdGVkXzE1XzVfMCIpCisgICAgICAgIGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIocHJlcGVu
ZF90b19zZWFyY2hfcGF0aD1UcnVlLCB0YXJnZXRfZGlyPXR3aXN0ZWRfZGlyKQorICAgICAgICBp
bnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBzOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3Nv
dXJjZS9UL1R3aXN0ZWQvVHdpc3RlZC0xNS41LjAudGFyLmJ6MiNtZDU9MDgzMWQ3YzkwZDAwMjAw
NjJkZTBmNzI4NzUzMGEyODUiLCB1cmxfc3VicGF0aD0iVHdpc3RlZC0xNS41LjAvdHdpc3RlZCIp
CisKICAgICBkZWYgX2luc3RhbGwoc2VsZiwgdXJsLCB1cmxfc3VicGF0aD1Ob25lLCB0YXJnZXRf
bmFtZT1Ob25lKToKICAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcih0YXJnZXRfZGly
PV9BVVRPSU5TVEFMTEVEX0RJUikKICAgICAgICAgaW5zdGFsbGVyLmluc3RhbGwodXJsPXVybCwg
dXJsX3N1YnBhdGg9dXJsX3N1YnBhdGgsIHRhcmdldF9uYW1lPXRhcmdldF9uYW1lKQpkaWZmIC0t
Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0
LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0
LnB5CmluZGV4IGE4OGY2MTg1NjdkM2QzMmI2MTVjNTYwYTNkNmIwMWNhYzcwMjk2ZDIuLmM5ZjRi
NTBiZjE5ODYyMGY2YzE4NTJkMDVmZDY5YjhkZDcxMGM0N2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfX191bml0dGVzdC5weQorKysgYi9Ub29s
cy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkKQEAgLTY0
LDMgKzY0LDUgQEAgY2xhc3MgVGhpcmRwYXJ0eVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAg
ICAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1lY2hhbml6ZQog
ICAgICAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnB5bGludAog
ICAgICAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnBlcDgKKyAg
ICAgICAgaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC50d2lzdGVkCisg
ICAgICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQudHdpc3RlZF8x
NV81XzAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>291211</attachid>
            <date>2016-10-10 19:27:59 -0700</date>
            <delta_ts>2016-10-31 16:02:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154667-20161010192437.patch</filename>
            <type>text/plain</type>
            <size>4134</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MDM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjE5MzdhNWNkY2FiYWI1ZTFmN2JhMWQyN2ViZDJjMDdi
YzI0NmQ4Ny4uYTU2MDVkY2RjNDNjOGE3NGUwZDU0NzUyNGY1ZWU4Y2FkM2JkM2I3ZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx
IEBACisyMDE2LTEwLTEwICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIFVwZGF0ZSB0d2lzdGVkIHZlcnNpb24gaW4gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5z
dGFsbGVkIG1vZHVsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTE1NDY2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFVzZSB0d2lzdGVkXzE1XzVfMCBmb3IgdGhlIHR3aXN0ZWQgbW9kdWxlIHVzZWQgYnkg
cnVuLWJlbmNobWFyayBiZWNhdXNlIHRoZXJlIGlzIGEgYnVnIGluIHR3aXN0ZWQgMTIuMS4wIHdo
aWNoIHNvbWV0aW1lIHdpbGwgc3RvcCB0aGUgdGVzdC4KKyAgICAgICAgSW5zdGFsbGluZyB0d2lz
dGVkIHdhcyBpbnRyb2R1Y2VkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNDcwODIgZm9yIHJ1bi1iZW5jaG1hcmsgc2NyaXB0LgorICAgICAgICBTaW5jZSBidWls
ZGJvdCByZWxpZXMgb24gdHdpc3RlZCAxMi4xLjAgYW5kIGhhcyBub3QgYmVlbiB2ZXJpZmllZCB0
aGUgY29tcGF0aWJpbGl0eSBvbiB0d2lzdGVkIDE1LjUuMCwKKyAgICAgICAgSXQgd291bGQgYmUg
bW9yZSBzZWN1cmUgdG8gdXNlIGFuIGluZGl2aWR1YWwgdmVyc2lvbiBmb3IgcnVuLWJlbmNobWFy
ayBzY3JpcHQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv
aHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHk6Cisg
ICAgICAgICogU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAg
ICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLmZpbmRfbW9kdWxlKToKKyAgICAgICAgKEF1dG9pbnN0
YWxsSW1wb3J0SG9vay5faW5zdGFsbF90d2lzdGVkXzE1XzVfMCk6CisgICAgICAgIChBdXRvaW5z
dGFsbEltcG9ydEhvb2suX2luc3RhbGxfdHdpc3RlZCk6IERlbGV0ZWQuCisKIDIwMTYtMTAtMTAg
IENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2
aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMDY5NzIuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl
YmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3
aXN0ZWRfaHR0cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y
dW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIu
cHkKaW5kZXggNDIwYTc1MmE4M2FkYWM0NWY1MzRjNDQwN2M3MWExN2QxYmEyOWM1NC4uMjRjNTgy
MDk4N2YxMGM3YjM4NTUyYjJkZDU4MGFmZDlhMzRmMWMxZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3Nl
cnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv
YmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9o
dHRwX3NlcnZlci5weQpAQCAtOSw3ICs5LDcgQEAgdHJ5OgogICAgIGltcG9ydCB0d2lzdGVkCiBl
eGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgc3lzLnBhdGguYXBwZW5kKG9zLnBhdGguYWJzcGF0aChv
cy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChfX2ZpbGVfXykpLCAn
Li4vLi4vLi4vLi4nKSkpCi0gICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxs
ZWQudHdpc3RlZCBpbXBvcnQgdHdpc3RlZAorICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5h
dXRvaW5zdGFsbGVkLnR3aXN0ZWRfMTVfNV8wIGltcG9ydCB0d2lzdGVkCiAKIGZyb20gdHdpc3Rl
ZC53ZWIgaW1wb3J0IHN0YXRpYywgc2VydmVyCiBmcm9tIHR3aXN0ZWQud2ViLnJlc291cmNlIGlt
cG9ydCBSZXNvdXJjZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBh
cnR5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5p
dF9fLnB5CmluZGV4IGI1ODE2OGU1MmY1OWYwZDgzZTUzYzAwMTc2YTYyM2Y2MjYzMDQ1ZjkuLjgy
NDU1ZjEzMGEzNzAxZDBjM2YxMDM2YmMzNTQ4MzA2Mzg5Y2YzYzUgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3Jp
cHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKQEAgLTkxLDggKzkxLDggQEAgY2xh
c3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9pbnN0
YWxsX2J1aWxkYm90KCkKICAgICAgICAgZWxpZiAnLmtleXJpbmcnIGluIGZ1bGxuYW1lOgogICAg
ICAgICAgICAgc2VsZi5faW5zdGFsbF9rZXlyaW5nKCkKLSAgICAgICAgZWxpZiAnLnR3aXN0ZWQn
IGluIGZ1bGxuYW1lOgotICAgICAgICAgICAgc2VsZi5faW5zdGFsbF90d2lzdGVkKCkKKyAgICAg
ICAgZWxpZiAnLnR3aXN0ZWRfMTVfNV8wJyBpbiBmdWxsbmFtZToKKyAgICAgICAgICAgIHNlbGYu
X2luc3RhbGxfdHdpc3RlZF8xNV81XzAoKQogCiAgICAgZGVmIF9pbnN0YWxsX21lY2hhbml6ZShz
ZWxmKToKICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNr
YWdlcy9zb3VyY2UvbS9tZWNoYW5pemUvbWVjaGFuaXplLTAuMi41LnRhci5neiIsCkBAIC0xNTAs
MTAgKzE1MCwxMCBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICBk
ZWYgX2luc3RhbGxfZWxpemEoc2VsZik6CiAgICAgICAgIHNlbGYuX2luc3RhbGwodXJsPSJodHRw
Oi8vd3d3LmFkYW1iYXJ0aC5jb20vd2Via2l0L2VsaXphIiwgdGFyZ2V0X25hbWU9ImVsaXphLnB5
IikKIAotICAgIGRlZiBfaW5zdGFsbF90d2lzdGVkKHNlbGYpOgotICAgICAgICB0d2lzdGVkX2Rp
ciA9IHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdpc3RlZCIpCisgICAgZGVm
IF9pbnN0YWxsX3R3aXN0ZWRfMTVfNV8wKHNlbGYpOgorICAgICAgICB0d2lzdGVkX2RpciA9IHNl
bGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdpc3RlZF8xNV81XzAiKQogICAgICAg
ICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHByZXBlbmRfdG9fc2VhcmNoX3BhdGg9VHJ1ZSwg
dGFyZ2V0X2Rpcj10d2lzdGVkX2RpcikKLSAgICAgICAgaW5zdGFsbGVyLmluc3RhbGwodXJsPSJo
dHRwczovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvVC9Ud2lzdGVkL1R3aXN0ZWQt
MTIuMS4wLnRhci5iejIjbWQ1PWYzOTZmMWQ2ZjUzMjFlODY5YzJmODliMjE5NmE5ZWI1IiwgdXJs
X3N1YnBhdGg9IlR3aXN0ZWQtMTIuMS4wL3R3aXN0ZWQiKQorICAgICAgICBpbnN0YWxsZXIuaW5z
dGFsbCh1cmw9Imh0dHBzOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJjZS9UL1R3aXN0
ZWQvVHdpc3RlZC0xNS41LjAudGFyLmJ6MiNtZDU9MDgzMWQ3YzkwZDAwMjAwNjJkZTBmNzI4NzUz
MGEyODUiLCB1cmxfc3VicGF0aD0iVHdpc3RlZC0xNS41LjAvdHdpc3RlZCIpCiAgICAgICAgIGlu
c3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291
cmNlL3ovem9wZS5pbnRlcmZhY2Uvem9wZS5pbnRlcmZhY2UtNC4xLjMudGFyLmd6I21kNT05YWUz
ZDI0YzBjNzQxNWRlYjI0OWRkMWExMzJmMGY3OSIsIHVybF9zdWJwYXRoPSJ6b3BlLmludGVyZmFj
ZS00LjEuMy9zcmMvem9wZSIpCiAKICAgICBkZWYgX2luc3RhbGwoc2VsZiwgdXJsLCB1cmxfc3Vi
cGF0aD1Ob25lLCB0YXJnZXRfbmFtZT1Ob25lKToK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>293481</attachid>
            <date>2016-10-31 16:02:49 -0700</date>
            <delta_ts>2016-10-31 17:44:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154667-20161031155853.patch</filename>
            <type>text/plain</type>
            <size>6258</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4MTcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2EzMmY2NzdiYzE0MWFmZTQ1OTk1MDM4Y2M2MjFhMjZm
MDAxNmQ3Zi4uY2FmYmE2NDkyOThkZDAxN2M4MzY4YjY0NTE3YmU3NGYwNGE4ZmZlMSAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw
IEBACisyMDE2LTEwLTMxICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIFVwZGF0ZSB0d2lzdGVkIHZlcnNpb24gaW4gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5z
dGFsbGVkIG1vZHVsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTE1NDY2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFVzZSB0d2lzdGVkXzE1XzVfMCBmb3IgdGhlIHR3aXN0ZWQgbW9kdWxlIHVzZWQgYnkg
cnVuLWJlbmNobWFyayBiZWNhdXNlIHRoZXJlIGlzIGEgYnVnIGluIHR3aXN0ZWQgMTIuMS4wIHdo
aWNoIHNvbWV0aW1lcyBzdG9wcyB0aGUgdGVzdC4KKyAgICAgICAgSW5zdGFsbGluZyB0d2lzdGVk
IHdhcyBpbnRyb2R1Y2VkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xNDcwODIgZm9yIHJ1bi1iZW5jaG1hcmsgc2NyaXB0LgorICAgICAgICBTaW5jZSBidWlsZGJv
dCByZWxpZXMgb24gdHdpc3RlZCAxMi4xLjAgYW5kIGhhcyBub3QgYmVlbiB2ZXJpZmllZCB0aGUg
Y29tcGF0aWJpbGl0eSBvbiB0d2lzdGVkIDE1LjUuMCwgaXQgd291bGQgYmUgbW9yZSBzZWN1cmUg
dG8gdXNlIGFuIGluZGl2aWR1YWwgdmVyc2lvbiBmb3IgcnVuLWJlbmNobWFyayBzY3JpcHQuCisK
KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJf
ZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHk6CisgICAgICAgICogU2Ny
aXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAgICAoQXV0b2luc3Rh
bGxJbXBvcnRIb29rLmZpbmRfbW9kdWxlKToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9v
ay5faW5zdGFsbF90d2lzdGVkXzE1XzVfMCk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhv
b2suX2luc3RhbGxfdHdpc3RlZCk6IERlbGV0ZWQuCisKIDIwMTYtMTAtMzEgIFNhaWQgQWJvdS1I
YWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBj
aGFuZ2UgbXkgc3RhdHVzIHRvIGJlIGEgV2ViS2l0IHJldmlld2VyCmRpZmYgLS1naXQgYS9Ub29s
cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0
dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRf
aHR0cF9zZXJ2ZXIucHkKaW5kZXggNDIwYTc1MmE4M2FkYWM0NWY1MzRjNDQwN2M3MWExN2QxYmEy
OWM1NC4uZWQ0Mjc2MzNmODdiZTQxZDIwYjNlOTdkMjYzYjdjMGExNTQ4M2I0ZiAxMDA2NDQKLS0t
IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2Ry
aXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5CisrKyBiL1Rvb2xzL1Njcmlw
dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2
ZXIvdHdpc3RlZF9odHRwX3NlcnZlci5weQpAQCAtNCwxMiArNCwxNCBAQCBpbXBvcnQgYXJncGFy
c2UKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgb3MKIGltcG9ydCBzeXMKK2Zyb20gcGtnX3Jlc291
cmNlcyBpbXBvcnQgcmVxdWlyZSwgVmVyc2lvbkNvbmZsaWN0LCBEaXN0cmlidXRpb25Ob3RGb3Vu
ZAogCiB0cnk6CisgICAgcmVxdWlyZSgiVHdpc3RlZD49MTUuNS4wIikKICAgICBpbXBvcnQgdHdp
c3RlZAotZXhjZXB0IEltcG9ydEVycm9yOgorZXhjZXB0IChJbXBvcnRFcnJvciwgVmVyc2lvbkNv
bmZsaWN0LCBEaXN0cmlidXRpb25Ob3RGb3VuZCk6CiAgICAgc3lzLnBhdGguYXBwZW5kKG9zLnBh
dGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChf
X2ZpbGVfXykpLCAnLi4vLi4vLi4vLi4nKSkpCi0gICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5
LmF1dG9pbnN0YWxsZWQudHdpc3RlZCBpbXBvcnQgdHdpc3RlZAorICAgIGZyb20gd2Via2l0cHku
dGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnR3aXN0ZWRfMTVfNV8wIGltcG9ydCB0d2lzdGVkCiAK
IGZyb20gdHdpc3RlZC53ZWIgaW1wb3J0IHN0YXRpYywgc2VydmVyCiBmcm9tIHR3aXN0ZWQud2Vi
LnJlc291cmNlIGltcG9ydCBSZXNvdXJjZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9zaW1wbGVfaHR0cF9zZXJ2
ZXJfZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0
dHBfc2VydmVyX2RyaXZlci9zaW1wbGVfaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5CmluZGV4IDA5MWM4
ZWM0ZThlNGU5YzkzZWUwNTE2MjNmODU0NzQxYWZhMTJjMzcuLjI2ZDg4ZmQzOWNiNzdhNjIwYzdj
MjA2YjMzNzFjMzMwNjRmN2ViNGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv
YmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvc2ltcGxlX2h0dHBfc2VydmVyX2Ry
aXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0
cF9zZXJ2ZXJfZHJpdmVyL3NpbXBsZV9odHRwX3NlcnZlcl9kcml2ZXIucHkKQEAgLTM3LDE4ICsz
NywxNiBAQCBjbGFzcyBTaW1wbGVIVFRQU2VydmVyRHJpdmVyKEhUVFBTZXJ2ZXJEcml2ZXIpOgog
ICAgICAgICB0cnk6CiAgICAgICAgICAgICBpbXBvcnQgcHN1dGlsCiAgICAgICAgICAgICBmb3Ig
YXR0ZW1wdCBpbiB4cmFuZ2UobWF4X2F0dGVtcHQpOgotICAgICAgICAgICAgICAgIHRyeToKLSAg
ICAgICAgICAgICAgICAgICAgc2VsZi5fc2VydmVyX3BvcnQgPSBwc3V0aWwuUHJvY2VzcyhzZWxm
Ll9zZXJ2ZXJfcHJvY2Vzcy5waWQpLmNvbm5lY3Rpb25zKClbMF1bM11bMV0KLSAgICAgICAgICAg
ICAgICAgICAgaWYgc2VsZi5fc2VydmVyX3BvcnQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICBf
bG9nLmluZm8oJ0hUVFAgU2VydmVyIGlzIHNlcnZpbmcgYXQgcG9ydDogJWQnLCBzZWxmLl9zZXJ2
ZXJfcG9ydCkKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgICAgICAgICAg
ZXhjZXB0IEluZGV4RXJyb3I6Ci0gICAgICAgICAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAg
ICAgICBjb25uZWN0aW9ucyA9IHBzdXRpbC5Qcm9jZXNzKHNlbGYuX3NlcnZlcl9wcm9jZXNzLnBp
ZCkuY29ubmVjdGlvbnMoKQorICAgICAgICAgICAgICAgIGlmIGNvbm5lY3Rpb25zIGFuZCBjb25u
ZWN0aW9uc1swXS5sYWRkciBhbmQgY29ubmVjdGlvbnNbMF0ubGFkZHJbMV0gYW5kIGNvbm5lY3Rp
b25zWzBdLnN0YXR1cyA9PSAnTElTVEVOJzoKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fc2Vy
dmVyX3BvcnQgPSBjb25uZWN0aW9uc1swXS5sYWRkclsxXQorICAgICAgICAgICAgICAgICAgICBf
bG9nLmluZm8oJ0hUVFAgU2VydmVyIGlzIHNlcnZpbmcgYXQgcG9ydDogJWQnLCBzZWxmLl9zZXJ2
ZXJfcG9ydCkKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKICAgICAgICAgICAgICAgICBfbG9n
LmluZm8oJ1NlcnZlciBwb3J0IGlzIG5vdCBmb3VuZCB0aGlzIHRpbWUsIHJldHJ5IGFmdGVyICVm
IHNlY29uZHMnICUgaW50ZXJ2YWwpCiAgICAgICAgICAgICAgICAgdGltZS5zbGVlcChpbnRlcnZh
bCkKICAgICAgICAgICAgICAgICBpbnRlcnZhbCAqPSAyCiAgICAgICAgICAgICBlbHNlOgotICAg
ICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiQ2Fubm90IGxpc3RlbiB0byBzZXJ2ZXIsIG1h
eCB0cmllcyBleGNlZWRlZCIpCisgICAgICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJTZXJ2
ZXIgaXMgbm90IGxpc3RlbmluZyBvbiBwb3J0LCBtYXggdHJpZXMgZXhjZWVkZWQuIEhUVFAgc2Vy
dmVyIG1heSBiZSBpbnN0YWxsaW5nIGRlcGVuZGVudCBtb2R1bGVzLiIpCiAgICAgICAgIGV4Y2Vw
dCBJbXBvcnRFcnJvcjoKICAgICAgICAgICAgIGZvciBhdHRlbXB0IGluIHhyYW5nZShtYXhfYXR0
ZW1wdCk6CiAgICAgICAgICAgICAgICAgdHJ5OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93
ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90
aGlyZHBhcnR5L19faW5pdF9fLnB5CmluZGV4IGI1ODE2OGU1MmY1OWYwZDgzZTUzYzAwMTc2YTYy
M2Y2MjYzMDQ1ZjkuLjgyNDU1ZjEzMGEzNzAxZDBjM2YxMDM2YmMzNTQ4MzA2Mzg5Y2YzYzUgMTAw
NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQor
KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKQEAgLTkx
LDggKzkxLDggQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAg
ICAgICBzZWxmLl9pbnN0YWxsX2J1aWxkYm90KCkKICAgICAgICAgZWxpZiAnLmtleXJpbmcnIGlu
IGZ1bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9rZXlyaW5nKCkKLSAgICAgICAg
ZWxpZiAnLnR3aXN0ZWQnIGluIGZ1bGxuYW1lOgotICAgICAgICAgICAgc2VsZi5faW5zdGFsbF90
d2lzdGVkKCkKKyAgICAgICAgZWxpZiAnLnR3aXN0ZWRfMTVfNV8wJyBpbiBmdWxsbmFtZToKKyAg
ICAgICAgICAgIHNlbGYuX2luc3RhbGxfdHdpc3RlZF8xNV81XzAoKQogCiAgICAgZGVmIF9pbnN0
YWxsX21lY2hhbml6ZShzZWxmKToKICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cDovL3B5cGku
cHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvbS9tZWNoYW5pemUvbWVjaGFuaXplLTAuMi41LnRh
ci5neiIsCkBAIC0xNTAsMTAgKzE1MCwxMCBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2so
b2JqZWN0KToKICAgICBkZWYgX2luc3RhbGxfZWxpemEoc2VsZik6CiAgICAgICAgIHNlbGYuX2lu
c3RhbGwodXJsPSJodHRwOi8vd3d3LmFkYW1iYXJ0aC5jb20vd2Via2l0L2VsaXphIiwgdGFyZ2V0
X25hbWU9ImVsaXphLnB5IikKIAotICAgIGRlZiBfaW5zdGFsbF90d2lzdGVkKHNlbGYpOgotICAg
ICAgICB0d2lzdGVkX2RpciA9IHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdp
c3RlZCIpCisgICAgZGVmIF9pbnN0YWxsX3R3aXN0ZWRfMTVfNV8wKHNlbGYpOgorICAgICAgICB0
d2lzdGVkX2RpciA9IHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdpc3RlZF8x
NV81XzAiKQogICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHByZXBlbmRfdG9fc2Vh
cmNoX3BhdGg9VHJ1ZSwgdGFyZ2V0X2Rpcj10d2lzdGVkX2RpcikKLSAgICAgICAgaW5zdGFsbGVy
Lmluc3RhbGwodXJsPSJodHRwczovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvVC9U
d2lzdGVkL1R3aXN0ZWQtMTIuMS4wLnRhci5iejIjbWQ1PWYzOTZmMWQ2ZjUzMjFlODY5YzJmODli
MjE5NmE5ZWI1IiwgdXJsX3N1YnBhdGg9IlR3aXN0ZWQtMTIuMS4wL3R3aXN0ZWQiKQorICAgICAg
ICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBzOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2Vz
L3NvdXJjZS9UL1R3aXN0ZWQvVHdpc3RlZC0xNS41LjAudGFyLmJ6MiNtZDU9MDgzMWQ3YzkwZDAw
MjAwNjJkZTBmNzI4NzUzMGEyODUiLCB1cmxfc3VicGF0aD0iVHdpc3RlZC0xNS41LjAvdHdpc3Rl
ZCIpCiAgICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5v
cmcvcGFja2FnZXMvc291cmNlL3ovem9wZS5pbnRlcmZhY2Uvem9wZS5pbnRlcmZhY2UtNC4xLjMu
dGFyLmd6I21kNT05YWUzZDI0YzBjNzQxNWRlYjI0OWRkMWExMzJmMGY3OSIsIHVybF9zdWJwYXRo
PSJ6b3BlLmludGVyZmFjZS00LjEuMy9zcmMvem9wZSIpCiAKICAgICBkZWYgX2luc3RhbGwoc2Vs
ZiwgdXJsLCB1cmxfc3VicGF0aD1Ob25lLCB0YXJnZXRfbmFtZT1Ob25lKToK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>293504</attachid>
            <date>2016-10-31 17:44:34 -0700</date>
            <delta_ts>2016-10-31 18:20:54 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-154667-20161031174038.patch</filename>
            <type>text/plain</type>
            <size>6237</size>
            <attacher>dewei_zhu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4MjAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzNiZmNmNGM5Yjk1MGEwMmI5ZTFkOWFmYjExMmM4MmEz
OTA4ZGFmOC4uN2UwOTZjMjU4MjBhM2Y2MDhmMDY2YmU3YjMzNDczODNkNTMwMmY5ZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw
IEBACisyMDE2LTEwLTMxICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg
ICAgIFVwZGF0ZSB0d2lzdGVkIHZlcnNpb24gaW4gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5z
dGFsbGVkIG1vZHVsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTE1NDY2NworCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAg
ICAgICBVc2UgdHdpc3RlZF8xNV81XzAgZm9yIHRoZSB0d2lzdGVkIG1vZHVsZSB1c2VkIGJ5IHJ1
bi1iZW5jaG1hcmsgYmVjYXVzZSB0aGVyZSBpcyBhIGJ1ZyBpbiB0d2lzdGVkIDEyLjEuMCB3aGlj
aCBzb21ldGltZXMgc3RvcHMgdGhlIHRlc3QuCisgICAgICAgIEluc3RhbGxpbmcgdHdpc3RlZCB3
YXMgaW50cm9kdWNlZCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MTQ3MDgyIGZvciBydW4tYmVuY2htYXJrIHNjcmlwdC4KKyAgICAgICAgU2luY2UgYnVpbGRib3Qg
cmVsaWVzIG9uIHR3aXN0ZWQgMTIuMS4wIGFuZCBoYXMgbm90IGJlZW4gdmVyaWZpZWQgdGhlIGNv
bXBhdGliaWxpdHkgb24gdHdpc3RlZCAxNS41LjAsIGl0IHdvdWxkIGJlIG1vcmUgc2VjdXJlIHRv
IHVzZSBhbiBpbmRpdmlkdWFsIHZlcnNpb24gZm9yIHJ1bi1iZW5jaG1hcmsgc2NyaXB0LgorCisg
ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2Ry
aXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5OgorICAgICAgICAqIFNjcmlw
dHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxs
SW1wb3J0SG9vay5maW5kX21vZHVsZSk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2su
X2luc3RhbGxfdHdpc3RlZF8xNV81XzApOgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29r
Ll9pbnN0YWxsX3R3aXN0ZWQpOiBEZWxldGVkLgorCiAyMDE2LTEwLTMxICBSeW9zdWtlIE5pd2Eg
IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBjdXN0b20gZWxlbWVudHMgYnkg
ZGVmYXVsdCBldmVyeXdoZXJlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jl
bmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0
cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0
cF9zZXJ2ZXJfZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkKaW5kZXgg
NDIwYTc1MmE4M2FkYWM0NWY1MzRjNDQwN2M3MWExN2QxYmEyOWM1NC4uZWQ0Mjc2MzNmODdiZTQx
ZDIwYjNlOTdkMjYzYjdjMGExNTQ4M2I0ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lz
dGVkX2h0dHBfc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr
X3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRwX3NlcnZl
ci5weQpAQCAtNCwxMiArNCwxNCBAQCBpbXBvcnQgYXJncGFyc2UKIGltcG9ydCBsb2dnaW5nCiBp
bXBvcnQgb3MKIGltcG9ydCBzeXMKK2Zyb20gcGtnX3Jlc291cmNlcyBpbXBvcnQgcmVxdWlyZSwg
VmVyc2lvbkNvbmZsaWN0LCBEaXN0cmlidXRpb25Ob3RGb3VuZAogCiB0cnk6CisgICAgcmVxdWly
ZSgiVHdpc3RlZD49MTUuNS4wIikKICAgICBpbXBvcnQgdHdpc3RlZAotZXhjZXB0IEltcG9ydEVy
cm9yOgorZXhjZXB0IChJbXBvcnRFcnJvciwgVmVyc2lvbkNvbmZsaWN0LCBEaXN0cmlidXRpb25O
b3RGb3VuZCk6CiAgICAgc3lzLnBhdGguYXBwZW5kKG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpv
aW4ob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChfX2ZpbGVfXykpLCAnLi4vLi4vLi4v
Li4nKSkpCi0gICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQudHdpc3Rl
ZCBpbXBvcnQgdHdpc3RlZAorICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFs
bGVkLnR3aXN0ZWRfMTVfNV8wIGltcG9ydCB0d2lzdGVkCiAKIGZyb20gdHdpc3RlZC53ZWIgaW1w
b3J0IHN0YXRpYywgc2VydmVyCiBmcm9tIHR3aXN0ZWQud2ViLnJlc291cmNlIGltcG9ydCBSZXNv
dXJjZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy
L2h0dHBfc2VydmVyX2RyaXZlci9zaW1wbGVfaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5IGIvVG9vbHMv
U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9zaW1w
bGVfaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5CmluZGV4IDA5MWM4ZWM0ZThlNGU5YzkzZWUwNTE2MjNm
ODU0NzQxYWZhMTJjMzcuLjI2ZDg4ZmQzOWNiNzdhNjIwYzdjMjA2YjMzNzFjMzMwNjRmN2ViNGEg
MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRw
X3NlcnZlcl9kcml2ZXIvc2ltcGxlX2h0dHBfc2VydmVyX2RyaXZlci5weQorKysgYi9Ub29scy9T
Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL3NpbXBs
ZV9odHRwX3NlcnZlcl9kcml2ZXIucHkKQEAgLTM3LDE4ICszNywxNiBAQCBjbGFzcyBTaW1wbGVI
VFRQU2VydmVyRHJpdmVyKEhUVFBTZXJ2ZXJEcml2ZXIpOgogICAgICAgICB0cnk6CiAgICAgICAg
ICAgICBpbXBvcnQgcHN1dGlsCiAgICAgICAgICAgICBmb3IgYXR0ZW1wdCBpbiB4cmFuZ2UobWF4
X2F0dGVtcHQpOgotICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAgICAgc2Vs
Zi5fc2VydmVyX3BvcnQgPSBwc3V0aWwuUHJvY2VzcyhzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5waWQp
LmNvbm5lY3Rpb25zKClbMF1bM11bMV0KLSAgICAgICAgICAgICAgICAgICAgaWYgc2VsZi5fc2Vy
dmVyX3BvcnQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICBfbG9nLmluZm8oJ0hUVFAgU2VydmVy
IGlzIHNlcnZpbmcgYXQgcG9ydDogJWQnLCBzZWxmLl9zZXJ2ZXJfcG9ydCkKLSAgICAgICAgICAg
ICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgICAgICAgICAgZXhjZXB0IEluZGV4RXJyb3I6Ci0g
ICAgICAgICAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAgICAgICBjb25uZWN0aW9ucyA9IHBz
dXRpbC5Qcm9jZXNzKHNlbGYuX3NlcnZlcl9wcm9jZXNzLnBpZCkuY29ubmVjdGlvbnMoKQorICAg
ICAgICAgICAgICAgIGlmIGNvbm5lY3Rpb25zIGFuZCBjb25uZWN0aW9uc1swXS5sYWRkciBhbmQg
Y29ubmVjdGlvbnNbMF0ubGFkZHJbMV0gYW5kIGNvbm5lY3Rpb25zWzBdLnN0YXR1cyA9PSAnTElT
VEVOJzoKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fc2VydmVyX3BvcnQgPSBjb25uZWN0aW9u
c1swXS5sYWRkclsxXQorICAgICAgICAgICAgICAgICAgICBfbG9nLmluZm8oJ0hUVFAgU2VydmVy
IGlzIHNlcnZpbmcgYXQgcG9ydDogJWQnLCBzZWxmLl9zZXJ2ZXJfcG9ydCkKKyAgICAgICAgICAg
ICAgICAgICAgYnJlYWsKICAgICAgICAgICAgICAgICBfbG9nLmluZm8oJ1NlcnZlciBwb3J0IGlz
IG5vdCBmb3VuZCB0aGlzIHRpbWUsIHJldHJ5IGFmdGVyICVmIHNlY29uZHMnICUgaW50ZXJ2YWwp
CiAgICAgICAgICAgICAgICAgdGltZS5zbGVlcChpbnRlcnZhbCkKICAgICAgICAgICAgICAgICBp
bnRlcnZhbCAqPSAyCiAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIHJhaXNlIEV4
Y2VwdGlvbigiQ2Fubm90IGxpc3RlbiB0byBzZXJ2ZXIsIG1heCB0cmllcyBleGNlZWRlZCIpCisg
ICAgICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJTZXJ2ZXIgaXMgbm90IGxpc3RlbmluZyBv
biBwb3J0LCBtYXggdHJpZXMgZXhjZWVkZWQuIEhUVFAgc2VydmVyIG1heSBiZSBpbnN0YWxsaW5n
IGRlcGVuZGVudCBtb2R1bGVzLiIpCiAgICAgICAgIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAg
ICAgICAgIGZvciBhdHRlbXB0IGluIHhyYW5nZShtYXhfYXR0ZW1wdCk6CiAgICAgICAgICAgICAg
ICAgdHJ5OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19f
aW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5
CmluZGV4IGI1ODE2OGU1MmY1OWYwZDgzZTUzYzAwMTc2YTYyM2Y2MjYzMDQ1ZjkuLjgyNDU1ZjEz
MGEzNzAxZDBjM2YxMDM2YmMzNTQ4MzA2Mzg5Y2YzYzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw
dHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl
YmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKQEAgLTkxLDggKzkxLDggQEAgY2xhc3MgQXV0
b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX2J1
aWxkYm90KCkKICAgICAgICAgZWxpZiAnLmtleXJpbmcnIGluIGZ1bGxuYW1lOgogICAgICAgICAg
ICAgc2VsZi5faW5zdGFsbF9rZXlyaW5nKCkKLSAgICAgICAgZWxpZiAnLnR3aXN0ZWQnIGluIGZ1
bGxuYW1lOgotICAgICAgICAgICAgc2VsZi5faW5zdGFsbF90d2lzdGVkKCkKKyAgICAgICAgZWxp
ZiAnLnR3aXN0ZWRfMTVfNV8wJyBpbiBmdWxsbmFtZToKKyAgICAgICAgICAgIHNlbGYuX2luc3Rh
bGxfdHdpc3RlZF8xNV81XzAoKQogCiAgICAgZGVmIF9pbnN0YWxsX21lY2hhbml6ZShzZWxmKToK
ICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9z
b3VyY2UvbS9tZWNoYW5pemUvbWVjaGFuaXplLTAuMi41LnRhci5neiIsCkBAIC0xNTAsMTAgKzE1
MCwxMCBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICBkZWYgX2lu
c3RhbGxfZWxpemEoc2VsZik6CiAgICAgICAgIHNlbGYuX2luc3RhbGwodXJsPSJodHRwOi8vd3d3
LmFkYW1iYXJ0aC5jb20vd2Via2l0L2VsaXphIiwgdGFyZ2V0X25hbWU9ImVsaXphLnB5IikKIAot
ICAgIGRlZiBfaW5zdGFsbF90d2lzdGVkKHNlbGYpOgotICAgICAgICB0d2lzdGVkX2RpciA9IHNl
bGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdpc3RlZCIpCisgICAgZGVmIF9pbnN0
YWxsX3R3aXN0ZWRfMTVfNV8wKHNlbGYpOgorICAgICAgICB0d2lzdGVkX2RpciA9IHNlbGYuX2Zz
LmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidHdpc3RlZF8xNV81XzAiKQogICAgICAgICBpbnN0
YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHByZXBlbmRfdG9fc2VhcmNoX3BhdGg9VHJ1ZSwgdGFyZ2V0
X2Rpcj10d2lzdGVkX2RpcikKLSAgICAgICAgaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRwczov
L3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvVC9Ud2lzdGVkL1R3aXN0ZWQtMTIuMS4w
LnRhci5iejIjbWQ1PWYzOTZmMWQ2ZjUzMjFlODY5YzJmODliMjE5NmE5ZWI1IiwgdXJsX3N1YnBh
dGg9IlR3aXN0ZWQtMTIuMS4wL3R3aXN0ZWQiKQorICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1
cmw9Imh0dHBzOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJjZS9UL1R3aXN0ZWQvVHdp
c3RlZC0xNS41LjAudGFyLmJ6MiNtZDU9MDgzMWQ3YzkwZDAwMjAwNjJkZTBmNzI4NzUzMGEyODUi
LCB1cmxfc3VicGF0aD0iVHdpc3RlZC0xNS41LjAvdHdpc3RlZCIpCiAgICAgICAgIGluc3RhbGxl
ci5pbnN0YWxsKHVybD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL3ov
em9wZS5pbnRlcmZhY2Uvem9wZS5pbnRlcmZhY2UtNC4xLjMudGFyLmd6I21kNT05YWUzZDI0YzBj
NzQxNWRlYjI0OWRkMWExMzJmMGY3OSIsIHVybF9zdWJwYXRoPSJ6b3BlLmludGVyZmFjZS00LjEu
My9zcmMvem9wZSIpCiAKICAgICBkZWYgX2luc3RhbGwoc2VsZiwgdXJsLCB1cmxfc3VicGF0aD1O
b25lLCB0YXJnZXRfbmFtZT1Ob25lKToK
</data>

          </attachment>
      

    </bug>

</bugzilla>