From: Marc Alff Date: April 30 2011 4:35pm Subject: bzr commit into mysql-trunk branch (marc.alff:3350) List-Archive: http://lists.mysql.com/commits/136465 Message-Id: <201104301635.p3UGZUUJ021426@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4095567122599995332==" --===============4095567122599995332== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/ based on revid:nirbhay.choubey@stripped 3350 Marc Alff 2011-04-30 Fixed tree name modified: .bzr-mysql/default.conf === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2011-04-30 00:14:44 +0000 +++ b/.bzr-mysql/default.conf 2011-04-30 16:35:16 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@stripped" post_push_to = "commits@stripped" -tree_name = "mysql-trunk-wl5378" +tree_name = "mysql-trunk" --===============4095567122599995332== 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:///Users/malff/BZR_TREE/mysql-trunk-cleanup/ # testament_sha1: 27019eb4466b373304cee1c6ac1c3b0ee2280bce # timestamp: 2011-04-30 10:35:22 -0600 # base_revision_id: nirbhay.choubey@stripped\ # jska5zi39lf1dv1f # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQDSxsQAAV3fgAAQUGP/93MC AAC///9wUAM17tNdw0czgSSQAAmaCU9pT0emqYnqNlHpAyKaeQieo2pqek9Q0GhkNAMgSRBTyNQy jJ6jEGjQAAaGGhpoAaAA0AAMhoEko9IeqepPKep6ntSekDQA0ANCy6BxvOutoedqk0VdNQsXyS/v kiJx4H7g2SKqb98U9vr3ph8ORBFzwmpogotTmRoSeV8zHcRfkKp73hUvnGguxxAdUSIWMTlKckZN pqZXBNhEn9uyxJxGaaSqwMnQ7ZdOdSsLfs4UER1FdRlYRTFSm695YStRb8YKN3ieSE9hPpgE67HC OBa9NZiErsI0+8lX3UwueRdzwgWTM6FZOnkOxnLxzbPPbChELr7hECM6CdU5DfzXKHRoLFgtmZNr mMIspSL2KjkxXiyrU4ClnRWsHWuazoq73AhhcQYMVXOETFfpj+Cm6jeV23EU3MM2KdNca6kWdPdu 3auOJDNforKaa50EAj4ZCRsfAXWR0QjJHYY2BrS0Cjo4cC2Nupmej5nub0bH464bJkp5aGTH7doV OpZHLeEucGy132SOhM2g+iIOotwN7FZFP175gVoZZLgt8JTbUj+lBSs+f2UELAZjtNtqYioofjks XMkZwJFrKYut0rrP6Kh1K3qlW5DGvxFj1Z0IuQ3bitfe9gUl93ses4tsN1YR7We6oPvheV6uO+cd NI2gcLNyzMFl5w2tP3coOyZUKZ7+lWlpKES5KC65cMlYOI7vWQCJcdOBCNMgrO/TtWxQcxTo1Hha oq4Vap1beZCyWJZv5WwnSSGuagMOwVeMr4HhorFzDXzFFqK5d258ZxrBSqgdIrV/LnCQa6g1QkMN uXCANibL3CO1IpvN41Wm5Qq7zS53PBWRX63WhTqIcHBtlqwM0Oym667ewsgUQ4Oon8kZBmXI60eq 1Y4MycwlgqQlJbVjPBMUSXnBRQWGRTZYprquWkNEpRGXUuIoUtuOyVAEcueG4xESNW7uKr8DQkqh m1dUhcZATMcVwDqcJHTneWDTxLGsDUCaFxEoAppsOZirK49C+f+LuSKcKEgAaWNiAA== --===============4095567122599995332==--