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 2015/04/15 20:23:22 UTC

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

Branch: refs/heads/2.7.x-fixes
Commit: 2ce2eae43d9b071763b040145e3a6ef9bc1b0ff8
Parents: 13c80cf
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 15 14:22:10 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Apr 15 14:22:10 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2ce2eae4/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9be32b8..11d80f6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -107,6 +107,7 @@ B 0e5b958dfc41d7debd5ee68b9eb8ba117ea6db75
 B 0e7bb9cdbb5f335147e2f2f82881e66f7d2000cd
 B 0e8b0570cfae8ffb7d8e0678cea09ae8d68b018c
 B 0e8efba29ee1b2151645a3714436d9546007f382
+B 0ec15341e8dde3ebf8956da8587a95bc0028a564
 B 0ed845dbe70783e0311ef934ed144525e7f3f705
 B 0ed88c54f0f9e0be0d6054f9cd56f0d07b4827d3
 B 0ee29500ca1d031490bbc245908cf3a44b42730e
@@ -513,6 +514,7 @@ B 40a2c68f02fc3f33ab3ca897879c91970382048b
 B 40a67be30f406ab11f28aefb6636fd8895054b75
 B 40b898684f18b5e4f0873d133a9deae618c576fa
 B 40bc1bdf29cf4e8ea3fdaeb948671f1e019031f6
+B 40c2449428409e01188948206fdf7a1a78ce63a1
 B 40e0f9319b575932d5f07081eb1a6d1bf8318e32
 B 4110c8eae0c6cb404697df1972e0aa368eeaefe3
 B 41267161bff1dcec36c2978fe863efdcf5947ebc
@@ -564,6 +566,7 @@ B 4604c9fe25da4be126b54c0eb458f8f32503ac71
 B 46193f6de59dd7d3780a62a8f46dfac46476c5f1
 B 461b3e98681c758fb5dc1e4e48c4fc98bcf177d9
 B 461f8d739a22fa5caaac3552244a693f4bde136b
+B 46617e66bf125dc660302350a0d04cbc6e09487c
 B 467a9d93355e8e87dc0b47d96499512bcee1b52b
 B 467d320553527adb9208bc22ff3938c9830378c4
 B 4681cb3b58270c4ce5a58a196afffd5fe3d14321
@@ -608,6 +611,7 @@ B 4ccaa6d5e605ea65978b493dc7bf673ba72a8ed9
 B 4d0254adf94a0c73569161a3ed011e53319bce31
 B 4d170b09fb600db59fe7dc92c8e3d08bf6c1c3de
 B 4d718903a14bd6b197473014334d6ba294ecd897
+B 4d7bae9997a89d470271f090a93f43a573a48c42
 B 4daa8a05d1851dc1b479b7c3b13e3a892b167f91
 B 4daba03ba3ad0f97032c1cebe5547ce6799decdc
 B 4dc42da1d3621024ba6d9a139367b91a6671f45e
@@ -753,6 +757,7 @@ B 61f520d3a83182ec2c8fe789b6a897fbddeb67fb
 B 62144e297cfd175addf57671e71773cc6a602340
 B 621622e3bc47cced4bcd887cdc5d2372460571fe
 B 6241186c4e4ec1c14ff467884f83716fe6e2e2c7
+B 624bb36e46cfd47f4443245ba476ac96e41e0877
 B 625e54cb8ef4bd4c06f3c25d9cbb1b0bc53e83c1
 B 6276add292e682e77601bd2ec3d8e545e5618b13
 B 627a47eb65a2e8cb3e9ebb6894f29d8fcc407daf
@@ -904,6 +909,7 @@ B 762719c29c74b78b70789d232b6602d09414789f
 B 76313002a3149d7fa0445baf11489ce7a5388ff1
 B 764404893044c6b11491eb083b220bdf575ed2a1
 B 7686ddb3ce2663c2f6923b41ce3948371e17103d
+B 76996bab569a769217519b1689055037462c3a80
 B 76a91535fe0cf6109e14472a4b3eff9fad0011c3
 B 76bba771d3ef1234d1f90807789c0a59da1e175b
 B 76e65e78624d6040f6fa77a6a5ea8804e10087c3
@@ -929,6 +935,7 @@ B 79a1d5ae953de1d6e3e55501097a8224ab64948a
 B 79b95e94bbfa19e53fadfaffc91153a5976e02ad
 B 79bd4f37f7fea32346195180566d1c2562d79871
 B 79be65ac292c636427922f61e85de6737c7b4975
+B 7a2608611dd2a1702ea161601fd609ff7bab491c
 B 7a5d8184f175e461a508270b5620a9702adda18f
 B 7a9039c7a6d001974b70cbd1df064991c8f291a1
 B 7aa84abd4385996d32f0c5cd945843c7ca1e35c6
@@ -953,6 +960,7 @@ B 7d30cc4af87f0e33ffbc6754c8551e46343916c1
 B 7d45890daa100aaece18da05aab7b1d065f306fa
 B 7d4f8ea0ca7f66cea41ae8bb52aedfeefa66bbfc
 B 7d5f8b519fd02633eb0d40b017a747b3ce7b0321
+B 7d74ef5cc9ab500d7bb35495af2928ccb5a6e9bb
 B 7d801fa5faec894c755d9e831fe6d76656233a96
 B 7dc270e8415ba6fdf3decb2d3a9f23722711bcae
 B 7dd5c51d7457908a176978e24ae58ded342b9b98
@@ -1027,6 +1035,7 @@ B 858314e5a8468f3eac749222af948fe064699e8f
 B 85c6cb558cabc1248fca9711b66a0dc15e3e6f83
 B 85ecae5551365fa8a11a5245db2b84ada543107f
 B 8601456b5f8725458c34c81a7a48d3f18497ae32
+B 864161a16c634a22fbec77dfe9d68b47fcf2535f
 B 865036b9e1576360b34798c5fc89e81af96fbfe6
 B 866935dcebda0e462759c2b24f1719b897d17908
 B 866b9cc093e22071996013f773207d118bd767df
@@ -1396,6 +1405,7 @@ B b89704d67dc4a9eb5cd59890956ebdcac0584123
 B b8a7ca3f4ffc962f28fa4a3d9a4cf9a458c25f24
 B b8c8ff2740307c7c7a874ac7dbbeac7b22959a81
 B b8f68b6ef1794e32e1a1b36b7347fe42bd0af7bf
+B b906f99c54d58756f31f1a58663e139331c0dbbb
 B b9071a45eb2ea0a06f8ce8ca4b1783c49064e79f
 B b91d4c69e23ed7935655a8c78670df407b11bf51
 B b92558cba08bb94781174dcd6c9a025bdec519a2
@@ -1444,6 +1454,7 @@ B bfd4a8c6fa96616883b8fee7c56a9e84e1e16f93
 B bfd50e974ed07f49bf8f981fae30cb80b213db37
 B c015b609bc41b8095e1bc83a443cf9d2e44000ab
 B c03492dca099f5b5827ee4a27b01b5a1c9fbf00d
+B c0698e5ef5bc51da7599ca2774854c979e258c41
 B c099c7d07aab30939dd1213411fc7878cc6bb25e
 B c09be288535b6a059e935a43a6ed5f9dfcbe26ff
 B c0bbe48ec37104321bfa2988878184c0763856b8
@@ -1529,6 +1540,7 @@ B cc0ba3f09068df3397adf5f7c55362bdffb96174
 B cc5172ceaffb018e3852c9ae3d9e3487cb65d80e
 B cc5a0385b83abf493446948267f2d1945bb4ee5c
 B cc674df55d596c8774d732ff537e490a159abfe5
+B ccb5aadd38ca375fb66086f5909f05f35dcdc18c
 B ccd9bdfa3ba91a53fece97f683555e2235c46799
 B cd058a9772ad8148cd4f67782f7692d9b4770b63
 B cd0c70d4982280aed6cfcfa4ccfc756305fbe1de
@@ -1760,6 +1772,7 @@ B e8d94a36e0f91ffb18da9a5c3bfb22580ab89afb
 B e91a5c202f37648943947ab3837edf5483d7a099
 B e920277a696df6f19b983fe81945c45ff775a17b
 B e92859b6279b233c0d4d81ccbc0210b55041eec5
+B e96857e358f70563a47a9c4c94a41f165b12bb48
 B e99a4e29176f781aa6f6fd281fcf86fe4eacb0b0
 B e9a8e89f1c816bc34f81afd28dcc26120b6021a7
 B e9ac42b6d4cfe14d40ddc9cc5232cfc89af153a0
@@ -2377,6 +2390,7 @@ M 987e491d6ae7f11c0f12fb33d365caec4306a7ab
 M 9893ce9d05456b7cdf95beac70fd56d29c2c6f08
 M 9899ab73b13a0614dd366ae7c8d55482d700d2b6
 M 992c0be0f1e19ffc19f88f5087eec2c5dff73025
+M 99b9510aac932561873690a16a306490c636def8
 M 99cdc078f30212f516dcf7bc2291c83bcf5475c8
 M 99eb3de3ab81776442f0fb1893f84c33a6b65242
 M 99fb33495d08513c90ccea76c247e7ac546de769