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/64786b8e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/64786b8e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/64786b8e Branch: refs/heads/3.0.x-fixes Commit: 64786b8ec22491568d363498a9065654350e1de4 Parents: 9def974 Author: Daniel Kulp <dk...@apache.org> Authored: Thu Mar 30 12:04:52 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Mar 30 12:04:52 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/64786b8e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 149c56e..6cbc989 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -65,6 +65,7 @@ B 0b7e0e914328aa7a78a2eab00bb1040c703e9b63 B 0b9097fbd1cddbb4a183e9448576bde2a6eb2589 B 0ba04d859c11116df8b9d31163e7c65aa1addbb2 B 0ba19453f17be19aa2e46848b1908f776a6abb64 +B 0bc42f47f79f2e301a6c8fe0c92acd945e43273b B 0bcc77743fad212fb54d119db3719858addcbabc B 0befccd8a70d7896d9210f554e19375e5d8cc168 B 0c0555f4ac850ec8e38302d73207170affe4376a @@ -643,6 +644,7 @@ B 609fcadef1b418c05f3cf9d29dac87f458281156 B 60cf6aa4f8a6323130133c4271691edd6f39d0b1 B 60f95e5c0d928fd0b518bac1b89e20b9a12e09b3 B 610057e6f2bdc7491e2e2266ec7ac41513fcd5f0 +B 6110435d74e8f268edf1516a667ab2deefcd0345 B 6168d90fab71f2a8811640bfbbf88bfd1eed1848 B 6187ae4e155acad436ae2ef53e5cc606c64c703f B 6192919b2afd6039f09fece7bc80d252c398c97e @@ -1457,6 +1459,7 @@ B e1d841c6ba4b0cad5b90a584cb3eefac3f0cb9a9 B e1e3b2c7ab2f808fdd7849ba7f3622e945296d02 B e1f392af26cd466970665cd822538751787b365f B e231ad5e62e91eaf02a46587de9a683c1809a71f +B e24153bd656e056a11fabe84569466df1663c8b6 B e242307ad8bbe53788f3e03e9e2f0ca977d01340 B e27ccedf71d44ca5b20296e8401eef302311ebff B e28d258049dc8501f6d2bc4d33ef21914d5a38bb @@ -1640,6 +1643,7 @@ B fe9f455840f085568637f3c0e4af413299a85eb1 B feaececcc19cf13b42d2c20d8f8a6e5c465cda93 B fec88085f5f97eb5b6b0bb3d5ceee7af1509876a B fecf633ce099ed1cfe3bc32fe39c239d6903a550 +B fedfefea62fb5d852e2310f7ca6594a7e6e3b41a B ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b B ff693a62de7674464fe28265c48ca07dcdb64026 B ff742436a3e177dc61106edf08f2509e727362dd @@ -1713,6 +1717,7 @@ M 2ccfaa3811525f21cab7dac3a900b91932395197 M 2cfcbbc2ce20118e06ca3ef11f08f6f106181055 M 2d3ac551c8614516cbbf288195d2a99cadb79659 M 2e701bcd1cabcc7ae4cb69346eacb8ab278e2827 +M 2f22341b6d3372bd0f98e3894db917d55eef7e06 M 2fc62cf0f53912b53a93409802f43418d067faf1 M 318cfdaeb15b8d230829d120f894bec6f15bc836 M 3228637a5070a25f625fb18fc21a7dd54ce16dfd @@ -1958,6 +1963,7 @@ M c55664128b1223667dedacc2011ccd5945d9c8b9 M c5dbb84ac4e5bf73555e85ae1e65a5065393c602 M c66b1a18100ac752e8a2fff712c01e6c682ffcd7 M c72cac8cbd73d92a9e0264c816176c2a33dcbcf2 +M c89b56c22cb1f5bbb442abdcce13aef6c4c8fcaf M ca0a435219e82734269f2c8330f0989576f019d2 M cc2a8d6e58dc2030f21633395fa0476e562393b1 M cda58270486b4d394b98a1a1a1d5bfcb366af2c1
