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/f7d259db Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f7d259db Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f7d259db Branch: refs/heads/3.0.x-fixes Commit: f7d259db9bb0b1a0a4d83fb9af65fbaef4d999d6 Parents: 6db98b2 Author: Daniel Kulp <dk...@apache.org> Authored: Thu May 14 15:15:22 2015 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu May 14 15:15:22 2015 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f7d259db/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 9f89b56..7d256d0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -21,6 +21,7 @@ B 131c3fdba9c4825b739adc3d149d0297175b8a86 B 13b9b012a31fdf1a7e35757a336fecc3c688848e B 13dfe0f9fcaa0aee4c603072436d85861a0ab734 B 13e01e23ea87ea5b06953f18bef4b173fca55b4d +B 159089a4c0bcf4d30ed819f064f0e31c6c3dc2af B 161e10bb2d87573974b8a1748f023c47ebbe5d49 B 162bbb5ea63cfeb6c258d750627c77c9e694f928 B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373 @@ -69,10 +70,12 @@ B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6 B 384ad75433037358ea1607c4ddcb0cd978fae10c B 388d6eaf045c0215c7cffc891526a402c70625ec B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 +B 3913cbf504bb863e48ed5fcff25edc06e25f52c0 B 39ac2b4eb848be0142d4f3e3da2bb6eb00ea55e5 B 3a080015474d27075b0b03aa9ec74ab443504ebd B 3aec3e286e4732918589c239ea1b8f7e1d3a9836 B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300 +B 3c2092b369f06d4f71134397240092a659bcbca1 B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97 B 42b3ae5ec3ae398082e892d6c37acb0809876894 B 42eba2f948a967d62dc0257a920715ae47ae4310 @@ -128,14 +131,18 @@ B 6400b3cd1d87e52723fac2641b34a5f0289b908c B 64eee11a907d724373f80e38db24b7474ede7164 B 64f232307444269286b7f14fc3838b07187d4c03 B 652d821683f12031258f7727d33157f3ab6ccbe6 +B 654ad3ac53607d01875b99314c282f98e42d1072 B 665eb259fced741f65de061bb026c3ab65a8d99c B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c B 67432aef1adb8e330c054431de9d0955e3993472 +B 67755ea99b1baf4c567196ac6f1e00d342d38132 B 68a567632a063c6f9bb27a73c151d21f6e855f50 B 69176e3dd7c69901d03f6d93bb365df784f06525 B 698cd0483b99f9638ce05557e1137ffce86d4185 B 6994a35eaf0a71dc392dcb094a6f418ef37a12f4 B 6bdc9257b691e140f435a567e0b4f566c71be6cf +B 6c58f0c8861c9e9a922d337da4ea8282c75255c1 +B 6c9fb62220345bce0b19561d95b38d5507f75e71 B 6d637dcb21bb4a17b9c581748e85bf5a82f6c9f8 B 6e4f0f60785de1f5774644323edafb4741b9e4a4 B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e @@ -143,6 +150,7 @@ B 702f27bc4a334b2d117262252632bf580f20f711 B 71488c6fa7635c88285214a0479379aafef9ed3c B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c B 71ced4709dedf62264a4bb630aaf4780cb94ce48 +B 71dfb1f0e9636b7685482cd9aafb9ef6283d28ba B 71e9ada9b119ad8d960b9be15bc5689d718273ef B 72ba5f34d674012e2f8ca8ef5add0b022235ee06 B 731d7df1181d717e2dc867c9e00118f974de6179 @@ -169,6 +177,7 @@ B 8ac2d4735a9254820ffdb5638f441c4dc051354e B 8c7e2493dc26e1df4a16168a5491ac96509549d6 B 8e028a617f026fca2499f850bb680ada0692d681 B 8e930bcfc6e68775db59957df8ee38d73499a6f4 +B 8ee1ce727f04099b2bbeea4164ad38005de769b3 B 8f967643447ceec89e58b079d8d8fc00cf232a02 B 8fd8c552f4c2a980a5138de19a2b74104776a4ba B 90312bc48f6e564bcafdaaebc3cd596c966ee674 @@ -195,6 +204,7 @@ B 9dfb278c7739b9f4621f43b8146d057e21fafb64 B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415 B 9fce658c4611f790983a3d5cef7312eec8771461 B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9 +B a04a1e06f7fffc5f145e33c6832f31b04782516b B a16abff276542979aef91f7e56cd8e67a695db14 B a2855695896d5084ea288b0fa47457e4b7bfac38 B a2e1e40d3c185f53741c937e7b861bab2808d70f @@ -390,6 +400,7 @@ M 990f4b1d594c8f1446d42a516eaef82020df2747 M 9c7b2bc668a8b1e1d620aa79c3c32927b06a3ff3 M 9d25f9a0617bcb30e19d23fa4d5b4bd7948b8434 M 9f18da888e37f203b1aa9a3240ed7b6aab3a4ef9 +M a088c793efd923a52f68044b02221f8b47569ef9 M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7 M a5b1c33534d83b4d0696263439d0d1a906b1afe6 M a64265c29be124e9bffb46eb35a68b3504860c3a