Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b012efdf5 -> 80a5fea83
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80a5fea8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80a5fea8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80a5fea8 Branch: refs/heads/3.0.x-fixes Commit: 80a5fea832a26f63642f2db03c62dd0a1e2c9f31 Parents: b012efd Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Mar 13 10:54:49 2017 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Mar 13 10:54:49 2017 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/80a5fea8/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 9be136b..38fa802 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,5 +1,6 @@ origin/3.1.x-fixes +B 000c347db18d4a774cccbc826cb1384360f272df B 004321a2e955665005b9c5bfe304feaf9cb622b0 B 004a87831c55655f2b91054eaeb3fff0f8e8986f B 005ee936d42897f7083fd9fe26addec4779d4764 @@ -964,6 +965,7 @@ B a95fdec3fc81f92692ce12aab8e5b7a7e6862ebf B a9e7837d71973a76eed184e764d21035969132e7 B aa0263a09466130dab9ed36a0293ed245ab9b233 B aa0a0a21e10709412b7b0491706933654be69dcd +B aa57ecfb9f9e0a0cf8900a05393dca556c6d8416 B aa5ef9fc7ed198021a246f99429d00863f336948 B aac1196c9e2ad02b596e24cc6f18cdb7ec30a21d B aafbcde58a0ef31e76bd4444b99592ef685456a7 @@ -1016,6 +1018,7 @@ B b2bad7f9eba17cac427edbab18b4b6f9c8ef7556 B b2e34286753bf61581fa084a90f6707918042419 B b2f6ad83021c1ff4c1f3118bbe4b27b938842f01 B b301d5628e0c239cd2c2bd24695e52d746114e17 +B b345217598f874f7c4a4966731fe68bcbe9900c3 B b3679092603a89574d597035c23e3d3662a796a4 B b38e4510c2063e234d6fe02231693a0a281a0147 B b3c5afdbb8b7f78a23392bc3c751664a82fbe8bd @@ -1125,6 +1128,7 @@ B c3bef354ca5cd17e3bc545e03f7c01ac64969867 B c3c74aa0cae75e09b5432f8e85ecc66616934fe4 B c3cca2d5d92576235e27692806d0c8233a8ce9b1 B c43c298801408fdf4fb7086341e96d66ecf51c0d +B c4709d14fda1cb3510c1b6f3670bbaa678f81d8f B c4a6faf0b8ba43143cdb96c8258a4b335f794b2d B c4c03e06de3ec8eb8b3e3b35a8c27d1615fd5931 B c4c969042edcbcd439faa0fc95c1f5130cf06c71 @@ -1142,12 +1146,14 @@ B c77ce1ad3415a6df49acbbf5159ad670cf481d74 B c79bb840febf402e498c9cec611ae7c3da27cd2f B c7ce403565c3e2bd1574efb34d9dc3ae52f89f1b B c8636c03666ce1d6bc101e5ae5f39a05375077bd +B c866412a807573b6d7e5e2575ff5ba4ea05ae72d B c87aa76033ddec5a738851117191da098706e494 B c8887c9b250d53148b7c0f59b5f55dbd34f02a80 B c8d77ac8b1d8d5c6307b585409efcdcb52a2ea4d B c8e00d41599e5e8716f110d764ed32df7b31fcfa B c8f54d8c38bfdd186a245fce865e7f32a5e01856 B c933c0be9254f5858102aea69d306908ce8a1f0c +B c984c729f47f2020ef3c3e2850f94d61df8be745 B c99738fc3bfa680bb332a0ad027c430ea0798c0b B c9a2f0d2e292c9e11728453fd4da910f9f1609a4 B c9e4ddd3940e330498512846db747cb2acf95f07 @@ -1375,6 +1381,7 @@ B f54b27f89a8f092b2f0462bee6ea58bc77153455 B f5655d81ea6a880cf6b8b1cdcabddf1cd4dbe869 B f573af6e8abe03e5dbe7944c97508f46cf4a3de6 B f595ca026d56ec5e58a38780677598d8f9d9ded5 +B f5b75c7a061b04a75c12fda170d5caff89c257e1 B f5b83ad364b11bca9c4d3e70bcc68951e096f8ed B f6293b0cbfd682a17d0f9549622cace14c68287a B f63e8ad713e6f140420e9de6a4fc2a7686fb1b8e @@ -1427,6 +1434,7 @@ B fc54df19531b8071c2cc240b40cb1bfd1d28dec1 B fc54f21168a9294f2900bd6bc30d1b2eb5a172e7 B fc5af6381e71a946b4a9f483dd78542276ea82b0 B fc78cd31869a4e580c4d2a9e7864ae6dae8c311b +B fcb6141014e9c66fcdf404f49776cbd853a18c71 B fcc8bcb38f33febf5c73c5f5f56d877272f27e20 B fcf585eb1b260c320281f1a5128307e9ae082547 B fd3471e58e63ee672babc015ed0929f6cd6862dd @@ -1436,6 +1444,7 @@ B fde8db305f362bd413d2b0f5dcdbb65917cc39a9 B fe416234bab8af30f1789c3164ac256af86e3b62 B fe9e4fbf7d99d8161c1eda0e49647cfcc0c00dc4 B fe9f455840f085568637f3c0e4af413299a85eb1 +B fecf633ce099ed1cfe3bc32fe39c239d6903a550 B ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b B ff693a62de7674464fe28265c48ca07dcdb64026 B ff742436a3e177dc61106edf08f2509e727362dd
