Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3997c7b6c -> 2fc4aea17


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/2fc4aea1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2fc4aea1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2fc4aea1

Branch: refs/heads/3.1.x-fixes
Commit: 2fc4aea17c98120c3715ef9babb19f58c0a79cad
Parents: 311679d
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Oct 14 12:31:27 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Oct 14 12:44:10 2016 -0400

----------------------------------------------------------------------
 .gitmergeinfo | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2fc4aea1/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4f6889a..7da6823 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,43 +2,79 @@ origin/master
 B 0234c09c11c0f89bd17f9b82695daa12af1fad09
 B 02d826d7ad223c75ad706c7b5443bd06ee6e2589
 B 0336a2399b1980e04372c651368f8718f75a4f14
+B 042d1dbe5f236125c77db8348bf66d4a3d4d2385
 B 04d072e8494cb223c8f7b288776640dea68339d6
+B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c
 B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
+B 0d5577ab87f324205565c4534b59e69049505356
 B 0dfaf8d72574511ad9027c663707f9e30b945fbc
+B 0f74af5ed7561838e1950c758a7a05e588badd10
+B 1116dff4ec9f06e2e69b040f5aa03779c0424c23
 B 111d52fd4b92d0222af9bf1c22156145ea01ed01
+B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff
+B 122d1f64f248294a4303632571ec363aea4c2179
+B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808
+B 183a2a4022b912a6c32c1d3e268982b2f78f7631
 B 189756a8ff668d39d59cb7ff1658ed40d70ec12b
 B 189b6643d30eab4d79a0f7722c9277e76e92a1fd
+B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32
 B 1c3085ea94a902e6bf4a49b50c121e778efd28c2
+B 1d2ff721ef4d63b86035238516afdf1a82855bd9
+B 203b5433bc44aa831bdd9b1dd4ab474d192dea6c
 B 22755d26ec2f6255004f57deec711ee68ce11d6c
 B 248c8f0458ce938a65c35006d484c6a4610cde1b
+B 269e96752b11aeb3e911da76bd3074d768860968
+B 26f43025348e101e981e3f64ecc3ddf483ad7fb3
+B 2d1da35c001514fd37bd74180c1fdaa11e2e7b00
 B 2fb1ccf60f1ba4e9d70f8c2a6329fa1a65e6a352
 B 304c62a11b8dbe000cdfb5de857619703bca79f7
 B 30a0754ebe160d75867bc2558612d555b88c8595
 B 343d06d94838cd26f682f7afbcea0e422aa1597d
+B 38919f57bfb2b880691950fc5f992b5649ea579e
 B 39851b83af116611ce0efe70c4b9a32ee8491523
+B 39a5690d7d50d8481739c290f49128be4d55f8ad
 B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
+B 3fbedf1397714824b9700cd4d49569087936fe1a
 B 4149e50e39a8d4ffb71924d42def376b634ef64a
+B 428bbe90e4189e70df9a6a450a10320c8be6d42f
+B 4427f7790e522144baa325e5b5c051885e9dc706
 B 447f2dac6e160b5cd495558ca8855ed481396c63
+B 44c608c205fd2fdac2f2fed9557c2c39730a44d6
+B 46438c487115889c4cadd86f70fd4109a0daa2b8
 B 4786e832573f1fcc07ed190ab21fdb2820348e4d
 B 47a431412dbd7669d89a70d6fed49053e70dfed1
 B 4b37844e9c15812d1855d0babded79880d2cd6fb
+B 4bf780105271e91451446a2d96032249486b32de
 B 4ddf74b1acd8f65b685c8e11b809a06807799f84
 B 4f1afbf76d3e525163663b71104ce2adb9cb7a85
+B 502db47a7c520767da2977376be5cf2fce3f56af
 B 517ef67f1a69d386de44153e5e09d51cb47bf4d7
 B 519a67dfa240471bb585929f263cd85051a9eb06
 B 53a46205871434d8c47ed45822e078e5ad6d2c60
 B 54910695917fb63a11982a8dc96a3b4d088963c5
+B 56dab42caaf27e3bedf08cbb419d3644aeccb7af
+B 57cb5447341949836b7d8cc8f00ca3ced68622f1
+B 584df3ae111595da1b44ccd9db9567c2172bbb2e
 B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
+B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1
+B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
+B 629af817f4762a12623e76fb7f7baefe98482719
 B 65e1e07fdb810ec9de135530ca3e3d23821836a3
 B 66447a377f0b2cafc2f337456b5fd41f832556e0
 B 671b1cfce0c423a1e9e8392fdd1750697fa968df
 B 68f110e5bcfe26d050bd05988ecd9c863e6e8742
+B 6958418ec4989c4391389ee6bfd1d9055ec127a5
 B 699f4c03de1acb1cf9eb95ad2db792dba5a56ead
 B 6c324421a358919b4ecb3cfdd8a2e0e16ff81724
+B 6d82b75eb982f13f5f071178aeef66e55b0e3fd4
 B 6df5deab24016d07e4099712b07535688d164d94
 B 6e7b79f6a8b6523b2248937275d92918e5682aa2
+B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6
+B 76edf9350e7640860b66196ad40396d54bbcb2b2
 B 77c3f51dcb1f02c8799f4e09676c0697e76a0756
+B 7a5e2690c36914ba481570c811f23d6e6b80bc07
 B 7b7629682d15345518e66d46e575bf1ac334cf00
+B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb
 B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
 B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877
 B 85c397f853c6b7ca0ed6d924445d6173962e1ec4
@@ -48,36 +84,56 @@ B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
 B 94b837228a1d9c706aa235bfe23b827eb04da63c
 B 9505a3c7c82691da2bad94459702a665b14420fa
 B 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
+B 9bcde744c2ad59a67c278d155f2ba22e35bacb7d
 B a05d75086453fa18ca4f4733f7cc8819693c786b
 B a219766354d6aee53c7f7a4da91f434af552b437
 B a261507ebd3104b1a00298801ec9815ed1e7a728
 B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
+B a998152a243dabee50aa49f28d76037666adecd9
 B ab05d4ee361670d3c251712f5819a0f0b7e114d6
+B adcfa17d94da4b27deb8ba952d0bd4dcfcf6972b
 B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7
 B aeecef53263cd1d595d991654f0a783a10adfdcb
 B b2c10cc6c18a6e6589d258436303c46b3f682f7e
 B b3ec59efcd10cf64a1bb8a399082071905f5baa9
 B bacef091c2152d51ebdefbe20244e73d1c26b39d
+B bbda68b6d7948d098ee598d248266f4ce81c820a
+B bcb96eb5cbdfcd473da2ef64709ec0dc541d3609
 B bceee342b32f3704ca75176d06067f90c6d3fbdc
+B bd8aff6652eef048513571b96c703f4333f24dfb
 B befeb0484cb195cbcd6163f65c54a94ba26d8335
+B bff51a63aa05df40f92c80bb940fb43af78653f2
+B c1e2c973fc42ba7027fdd0ff1964bcbf8e61dbd6
 B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d
 B c2ccecb23ba23497c95be89f9b37f38c69faba7a
 B c63f06f3782148373912c1e4dc86de0d0c312229
+B c8e788eee8f7b5ce3a2161dfe727f3153ded607b
+B c978ca0274c06abd6ebf67adf2a839c4624b4906
 B ca2f8e81168b5b4ca72fa6c3c4529109c7d7c5d0
+B cb405d4275a5cf30187c4fbf957dbbb70a9eeacf
 B ced98c6e937bd93f92dac9043fa0406c696bfd84
 B cf9ab27a843df4532d9bd78209aebcafee2ffffc
 B d151322220de948dea0539d5077354c988db80fb
 B d226c07d4db15fa9244a2f011df801839a880f68
 B d26570e26de80d0e0c6870ae5d959bfc8c0d19e4
+B d3900dd8431e50e544896cf0ce019595984384bb
+B d8a0a04d9b8b5206c2e24e976a94f328c73a49bf
+B da321593b597711af7307a0fc2c11de070653356
+B de675431040a434c2bd1ef66667472fb4a49a9ab
 B dfc84b0fac84e001069800b32f01529d50339cdb
 B e14d803ff84be7c59dd7c2321f1090231967d45c
 B e1c60863ac10b56d423613c7d3d2f45c7ce18e14
 B e2efd0386e210d162c7646f4a4f2aa15e9752924
 B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
+B e6d84cf9f3ac669003402d122178a55e8b7e4493
 B e6f0722615190861192972a51b3986b34efd1f0e
+B e7895d6a7cb071fdea57f6d2607dabe2d22db47f
+B e7e75c58c283d0178c6929cf298a68f41f6a8459
 B e824784db1bda81c68aaa407f471588acea38865
+B ea458d27bdbd30b0b3ef785d18e45ddf2a75b74a
 B ebce4a65b15a1a99f18c1ea0111affafc447ce7e
 B ec3103f88b20fc05e92994b6a06b65b4a91dd75a
+B ec95dfbaf9fae88d21c98305d6415c65c00fd2fa
 B ecb6eba580c81d35991df66681db8dff99b1b087
 B ee6ceea0d493b1b2dc6d83ca6923c3baed81885e
 B ee6e9e7d037de08ebc4a017ca7525d3ca67d2adb
@@ -85,7 +141,9 @@ B efb1f0830f5441777198737fb26e9305ab969f66
 B f0e08b7bea2660542e18294d490e68c7b14aaa4b
 B f1b56150d6520e73d2ade2296c3b2f13839e63e5
 B f2845b37c6e7042470f869edc2ce9138f83d616f
+B f2db225034f82e93617aa8aece8bf059b8758626
 B f2f8b95ad823b38aa68e7a2071eac0b5b637b2aa
+B f66dea949bdc3f136084115aca4e514bad426380
 B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
 B f98785bd8490c4717353f1a9688cae3e7a823ec2
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
@@ -151,6 +209,7 @@ M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
 M c01c68ddda10ec6db492b86d818498bec0bf4228
 M cf8ac102e728b8745da265ec969f7b5160829fdb
+M dba09f00804cc05d943fd95d34882d6368c28edb
 M df3854cefae5d2da71f8d222a86218e81df7bd05
 M e578ea946aa13177adef98727e3e4606652ffc76
 M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa

Reply via email to