You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/03/22 20:20:14 UTC
[3/7] cxf git commit: Recording .gitmergeinfo Changes
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/21a7f538
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21a7f538
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21a7f538
Branch: refs/heads/3.1.x-fixes
Commit: 21a7f538c3e91d2f5b0c1250c866ea43405bcb42
Parents: a4fad99
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 22 15:21:56 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 22 15:21:56 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/21a7f538/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 244809a..1277369 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -20,6 +20,7 @@ B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c
B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
B 0d5577ab87f324205565c4534b59e69049505356
B 0dfaf8d72574511ad9027c663707f9e30b945fbc
+B 0e1d4826cab2975b437219f740381574536d4ff3
B 0f74af5ed7561838e1950c758a7a05e588badd10
B 101e9a0a43f2d819057d995adbb6e6776d5c7f40
B 1116dff4ec9f06e2e69b040f5aa03779c0424c23
@@ -72,8 +73,10 @@ B 3ce7f00461d9c868301003b5c16138c491a9ac0b
B 3f259221fa1dd9227397400ed9653374cb4fdc39
B 3fbedf1397714824b9700cd4d49569087936fe1a
B 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec
+B 3fe8e92229ba50dbc6758e6420b44ac16751281e
B 40380d8e57cdea0d909f3a9ee207628831c202fa
B 40dd6d61c5e6e276df9437e5f000e103ee6101d6
+B 41262ee0264445ad7fe288c0f0bf640c8b9dbbc5
B 4149e50e39a8d4ffb71924d42def376b634ef64a
B 428bbe90e4189e70df9a6a450a10320c8be6d42f
B 4301392fae084db72886290091ea5745144d97f5
@@ -192,6 +195,7 @@ B a2c912b418831967b49f59b2c8bf33a9eb53e281
B a38da9e8f15fb158bf0982c61750ef48e5814792
B a4167fb84baa1834bbe86be8a749c385f1af8c82
B a4b794b55b1ea258e9168a58f05794f37aeeb049
+B a4b98454d147437ff71b92355d60e8bd48d56448
B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
B a81534d6655e046e7d316e6de38095fe3f4949cb
B a93cbfd994c34000f27911c5aab6638b60d61ff7
@@ -333,7 +337,9 @@ M 146b00d1947058705c873dffe2ba78ad35c8b03c
M 156b166b093aa92c1fc400e0f1f7440ded701169
M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
M 19a4d72a32f1e18bec621af403ecdf21d97453af
+M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
+M 1a7411c270810507626a15d4a4cdc574d6ff62c3
M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
M 1e57d379863d01b9330fff797c14d81a56b0b0f2
M 20d0a2811c15cb65a402eb063e1359236d7014ea
@@ -348,9 +354,11 @@ M 3088952a6e3385ee628cf8c91340908ed3a67aa3
M 315a6dc119f7bf0ad1f8f8ee74093327852dc365
M 34fd320f91d933233aeb364120456f4fa0f220ac
M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
+M 3833280c67c489a7e83b8540361df4154f4aeccf
M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
+M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
M 437c7daa3345c8482deab4a4da9b164e68fd417a
@@ -371,6 +379,7 @@ M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
M 6242c682dfce4a2ba4869978c28b14f1472484c1
M 63a1088a9253da0452497440e900d35a5415c3c9
M 65c1204abcef8720d4eb985d58e3f865e39a1da3
+M 6613e46662317ea151f72e26e5deb4f50148a148
M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
@@ -411,6 +420,7 @@ M 9b2bda583c09861c693122ab631c4bffa2187ddd
M 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
M 9cd3116cbdbbfb139f40ad2d9e49cec1adf08a08
M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
+M 9d64bcedb508732cdc377312f0fb433ee1dc630e
M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M a034e5853484a7ef0a9f0ad1ae6582178f622f31
M a1710bdd783afcd667d9e72ccb031480d3806850
@@ -423,6 +433,7 @@ M a9fe8470ce9522f08c298e58f76636c48d57b7a4
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M ad18f5aef28eb82d613b3f4226b2ddae19b6415f
M ad200706d0ea914987930a64d2f5c14336a0c641
+M ae3ae2a25109375cc82114d15078f04e8c5353c5
M b0a79aa7b48da6acdc6da1169abd690ecf914ca8
M b1c6125f50b294b0e2ebc927671e2ff53b5001bf
M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
@@ -444,11 +455,13 @@ M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
M cf8ac102e728b8745da265ec969f7b5160829fdb
M d0821bce5faa119c882a9000dbe03a124df5b033
M d187ef6f3906d867a8c30a991d9074d170bca487
+M d3bf494ef4987debad986cae87cfe5f095b79090
M d46818bd3043d211774de9bc531849f54bb2989f
M db1e5146e6312a4be35b0ca2644a691cb1d41a0f
M dba09f00804cc05d943fd95d34882d6368c28edb
M ded06c40ba057981e003903faa93beb94cbe11fa
M df3854cefae5d2da71f8d222a86218e81df7bd05
+M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
M e578ea946aa13177adef98727e3e4606652ffc76
M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
M e92e57c1f14de911cd2315a907443c79e91a94de