From: Marc Alff Date: July 26 2010 6:13pm Subject: bzr commit into mysql-next-mr branch (marc.alff:3171) List-Archive: http://lists.mysql.com/commits/114373 Message-Id: <20100726181353.0B06945E81@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4350238824208806519==" --===============4350238824208806519== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/malff/BZR_TREE/mysql-next-mr-stage2/ based on revid:marc.alff@stripped 3171 Marc Alff 2010-07-26 Fix branch name modified: .bzr-mysql/default.conf === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2010-07-26 18:12:38 +0000 +++ b/.bzr-mysql/default.conf 2010-07-26 18:13:49 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@stripped" post_push_to = "commits@stripped" -tree_name = "mysql-next-mr-wl5291" +tree_name = "mysql-next-mr" --===============4350238824208806519== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-stage2/ # testament_sha1: 7bfc3878d9f141a6834c1dce5bd497ead12b0c2f # timestamp: 2010-07-26 12:13:52 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-next-mr-wl5291/ # base_revision_id: marc.alff@stripped\ # dukf1yvhut50tm18 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaLnRX4AAWLfgAAQUGP/93MC AAC///9wQAMa4DoyBqGiKZPRpojJ6j1NNGTTTQ09QaNA0VPKflTbVPFNAA0GgAAAplAAAAAAAAAJ JBGIAFPIRplMo9TymjTRvVBUeJpsuDosERUdEpWThTcNMMQgBao8ADXEvJp8ACIYYI+Iflgx+KCB x6lsS6ygkGQqDsi9xDEENkADnSlvBICjPXPKrhI3SJLHO2ceRFF2zmEOXmwh2LRd7jJ44vQnEFFy gQcTW4TF9uVQj9oSLjY6btcmfN6wDrSzK+z8Vid9H4X+3QtofxYIebLz6g4pLz1qXqHFvDtFRyF9 nJ6fQ0gHIQw8lTeSIhU3Qrw5i2FC/15W7eXTpcLGIZvv6RpaRIMrRzXaFYETIzsCtvUGCtZhpylK qfD1q9sxD8KiOjjpbasbi8KhhGTsGL97c7LFjXjVcEJ2qAilcR5aMq4tMgTkQoilpqbbgIsCjTAS OcWCLIK6DoUMaoQm4ILBGpxIhVW3uamt88nN6tx89dkiddGTH9O5FrrGR/3vAYOMPHt2SJSk8OqR 7WKEDv+dEiiGWi7Yb8d99uXCvBP7L09Oo4p42PLZmSNBbpFjLlf7c/oU6KK1HPWKRRYctIhfeBpv IE0NXlwqEwTAGi+1aVWmiRQCLpLozzWR1sOWYnYKnPj5QFh5GTCia2ummcKAmEJJcku4FH8wSMFq 45grD/O/xYx+5ULuL0WgQ3C0WCor8zQu7fpNDg0TjLYKfnXF+QarMN2F+oQsFsfQZBkuy2DwKYTe HOaQx46JDxWp2NwS+BEQbMPk+RnbeazFYoXnlOEDsqiukJVhtzJkAhIZOdohzJl0poCeHdyeeEjM Klg5UxuwZk4faqtYxXcXCyeV4piaS+5EFayJ8XFeslpJ+EYh6qN8KLaUgDQtXwlQ1ITr7CosID3v EQbXQqXMkBWCkW0BgWryatlpmjnaq/uG6rVgahAU0pCeiguaivgDKEzfxdyRThQkKLnRX4A= --===============4350238824208806519==--