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/6108619c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6108619c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6108619c Branch: refs/heads/2.7.x-fixes Commit: 6108619c3ff678f4ebfdf78cc8ce869e377dc211 Parents: 1cd2ba8 Author: Daniel Kulp <[email protected]> Authored: Tue Dec 2 12:39:37 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Tue Dec 2 12:39:37 2014 -0500 ---------------------------------------------------------------------- .gitmergeinfo | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6108619c/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index ea31e00..a00996f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -239,6 +239,7 @@ B 21e62294ef0fa905db70f1704df6999d2ff5aedb B 2209258ce1246f3f48d23d51c4d981dd47b3d600 B 221efc02f90eef7f319ba39b8aefd14922901d70 B 2246e1393aa56ff8411efabf2d49c3ef75ffdfec +B 224fa3c6412db10a451558e67bf0a6913035fa5d B 226906c48bb2c71b70172d33ea528916f8c62dff B 227bf19947e2888b8ceee53287bfbe78a1d824b8 B 2296e119c02a1ac5d95492bb5fc4e24e0c02b979 @@ -285,6 +286,7 @@ B 2932201285b61c4e267a906485000c00f2edb1ee B 296ff8ec4e19396c6fee2e788968b843a47686ca B 299f085b723321401460e4fc8343563f795b6b73 B 2a057461bc998a3c539434f7fe21adc5880e9d40 +B 2a6afbcbbd56f2b3fc79bcb68928164322eb6c1a B 2ab9ae38492f89375eeffb44c614f5b6d2efc2e7 B 2b3a7b173d40311de79f30e5dc875a209034c360 B 2b3bb5e434082422a1631a434b3bd346c0ae766c @@ -376,6 +378,7 @@ B 38420ba6ed76fd59da08ac23886dfca5d9dd1c1f B 38670427fe972560402e70037d8f874136e94050 B 38777cce211205f04ce2006373356af9ab96da7e B 3887304cbcd25223912f5c62e2d5bd8be022caef +B 38962dab94efd1cfafd562dec34819719367a81a B 3898dbb3e29202c0d2942fb903fa29a7c16418a7 B 38d9ace960004de4a38035efd411dac1d84cb85d B 390665f203c2ef3d2651cbd7e8cfd12d12420329 @@ -431,6 +434,7 @@ B 3ef21c829aa2c8272f87c2d9564011b95a976587 B 3f1542f09664fc185546e24ffb4699233da0eec2 B 3f4fd1c96ed389a7153df630ab01033ad3b350f5 B 3f6e48515f61bfe66cdc489f6ec72cd3cb7aaf26 +B 3f7c187b5f8e49787a0e175b34712a78bb18081b B 3fa3231b13f06664b6aaf6b56e3de5738c89a574 B 3fae604e2ab638a5fbce479078245c75675b5e72 B 3fc5b8571d2454fc7a93e9a65a09b4c58968e74a @@ -924,6 +928,7 @@ B 8d7f5e41fe2bae0041768e7a0129c42bf869270d B 8d91c92b347e666bfc3bf7a0db0f5f85eedfc7f4 B 8d925e6f5b829cf206a5333c13181f92c25712bc B 8dc5465c612b9c816ef0d4ef1399340a65b4754e +B 8e378c3d50f53aaacb8550bf96489bc820ff2458 B 8e54dcedbb0f99a11598faa824641ff76f9931a6 B 8e784d1b8b1adddb1c7a82ada44fc856c743a97b B 8eb0e72d3da0247bcea0a29fcdc29946c2fc4c73 @@ -953,6 +958,7 @@ B 910f4e95785ce77628833a296b036b0374570e7f B 91157710e5c6b0fd2f808d0c5697e458af866d38 B 912dd1c11798dc69320dc7c81667e02925ebeed4 B 916b902173de7e32e0b9edde8523eb4559415191 +B 9187e73cbf482398487271605f605a1b43a7cf2d B 91b367b770f6f21d932faa476428bfe41722afac B 91c4d3019a2cc058566e7cd4e3b860329639cf92 B 91e6b02ac476064808a8926815e4442d23f61378 @@ -1361,6 +1367,7 @@ B d711d7523901b5b14f4af265710a1c997708a808 B d78f8c6576086db2baa5d467ff8c506466ce3859 B d79b6b1142e07822075b38b0c00e8901a6c462da B d7cec5b8c8d107b98237e4e31c6d02accf765427 +B d7dc4951b79b1fcb35030b4752ce563fb10ccbfb B d7ed81cfe0b10d5562ad7793b4fe2402d2582b28 B d83ab4e5bb0ae262b8a32ba18bc55a1ebbc963bd B d84c6514622c94da56e0665cd4383aedffb24220 @@ -1392,7 +1399,9 @@ B dc4f09b76afa9c5ac2d06d113fb0811f9e4c3594 B dc5bde7d96f8db6008a09d6d49f749da338b88e9 B dc7873b1c7fda96eead98bcef04864935f39f550 B dc9ae1559e892067c06daf00772e458b6428b1f5 +B dd2f603ae47ac06bcc6ff413bcb1880ab3144fe4 B dd31efec968b7e0fc084065c058fdb1f6e66af72 +B dd56dc911980478cc2702300865d2e9fe6d93ecc B dd61195c15e6810e3edbe6547162e8d19bbf2f72 B dd7889902be831becf1dc57b3639cc882d953267 B dda04a0d825d4fff19eda772b0b1d52c6b5978c2 @@ -1486,6 +1495,7 @@ B e76e09aa7eb1011599e1137e88257e122494c116 B e7a542708da68bedecc87ecb031c3c484dbd42a7 B e7b4edb1f402b1fe398e94767e14cd0b8d13b906 B e7fe2b7ec6a4df1e0b9d27ebdd9ff74ac8ad267d +B e80db09d37d99d540cdbef7114efeb26317e3a52 B e82847091d5a4776ce2cd9d6ebf3d98f4ebc3558 B e87711abf86054a8fee51d1a33399ad26c878a67 B e8a265088255cf4d04f6dbed64dccfb6c0f31c28 @@ -1529,6 +1539,7 @@ B ed0fc365473d395c241232dfa4d10f15d8f90c3c B ed66e7d56758e60c96091b208c81c2f2b26bb61f B ed8ac50116f225ad4a71b888b7e4f44c1f81991a B eec9d19c2bd836b28d60ec826f3ed0bd9e67e977 +B eecaebb4b0ea89fc2aa94acb6464f0e913b8b223 B ef89633ac7154afad1d3f17dc438e3dcbd7c3633 B efbfc2fa90b21e7766f85cb36445146e5c516061 B efc7e27a5c4f368d7f54a8053504026d71d722a6 @@ -1558,6 +1569,7 @@ B f3497b00bd89e2978d605425c98f93fd310f442e B f34ea2c8d96f88c41420ec9b851240cd7197def3 B f360f14089d616160553b1ea336c0d51a0206443 B f372fffe46870f44ba491afbff1807d4a8799b75 +B f4038eebd6c287d55eabe7c72c4bd23e1a7df0e9 B f42f6b6ba6037850bd200923b72fd3e716ccbbff B f45bfa1b92dac579d570b86d20fdbfe6ac4b5feb B f46a9bcb9de8a3c02a9a78a1e27c8b84f205c10e @@ -1613,6 +1625,7 @@ B fcc19c3ddd36f3a55ae2675e2ebbf853cbd3d9f7 B fcef06bdf510d58544357bd71ae1e7221caa5b47 B fcf3c8a7223e5605e4fe55b74d30dd9f6924ebc1 B fd0528c0f9dd112264f7aeffa04565e18d973884 +B fd659c11eaddce26d167f97fbc6e62007f83e00f B fd92c807e8773c363df37cfaf946971f5bac763b B fdbdbbd2802b40d97cc64cce6eeecd9c5393887f B fdc197e9f936a17ccfc50fc2755f1bb3d45ff205 @@ -1683,6 +1696,7 @@ M 1091ca3dba842093f2a65f3727e44344605b005b M 10969ab68f7f566b88de158bf78f3b9e51384776 M 109e40d4511f7f5eaafd73e0a6e43877d7f6f6bc M 10c6be01530e9a8c323fa53743961a0e7ad7e062 +M 10c8fb6e2c772cf766578c9f87e5204e5c16b863 M 10d86cfe1b44ea471a6ddade1ef97b0090b29fa5 M 10ee4399bc892c4f96e481882ca89d4ae04edab7 M 11b4bedd47eed11662f3021f6220a6bd4aa01fa8 @@ -1875,6 +1889,7 @@ M 50c679edcc220d4170d6c1bd168a6c12aa1f583e M 50cb750c66d91f2cfa1b0c5c36e56f4c56ff4909 M 5144fc575c71f53a76b3cab64a4fe54b7c1a139e M 51814b35896eb9143c62990a95d60d510a8d48db +M 526d4ef97a9b459a7c6c8b48e8e1b072a54b55b0 M 5287bb35f427feef1a8d1daffee157abda488d51 M 52ec9e00350c6d1f2a4f3122bb19ddefb4dfc9b8 M 5365fde2cf50167852ac5aec5099aef509eb66c3 @@ -2133,6 +2148,7 @@ M b08a5b0b5642b588041ecd9be652578a98fbf945 M b15aa32fbf449e4c402b262b8c215fbb950314d6 M b1d7db59317853fd6d44ed9c0cfa5296d50a8b2e M b218997b9bfe0f4a7475e25d2c1efaac0e5bf9e5 +M b2bbfa3c3a46359d5113858ac21ff79b8708bd10 M b361f68c23a339965c23699cd4c0d6085d89e6d1 M b36e977a6f63c8b8e094d6b2873d257221802e9a M b3976c6ff723b34f09e82449333db254093e82fe
