Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 8c8a1faf8 -> 26314c27e
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/26314c27 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/26314c27 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/26314c27 Branch: refs/heads/3.0.x-fixes Commit: 26314c27ef4fa43883a4466a03e4126a19101cae Parents: 8c8a1fa Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Apr 25 11:25:02 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Apr 25 11:25:02 2017 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/26314c27/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 2db0dd0..6489869 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -836,6 +836,7 @@ B 7c3ce3d499651177e9e712d49c7774c5796b1524 B 7c7404970a05900911b97c28a08665f5db3dcaa8 B 7c7bf49e2c980e34610e0647e286ab0f5d7e63e4 B 7c8124a5696de6c20ff5837531aff937eedccf0f +B 7c8b43ab17bcee300ddcdac7a9cb0daa0c74617a B 7cd1f5f608fd08a1c47d3ae2c1585d308ff3c724 B 7cd4cf67ba5b8a0ddc36c8008bf096b469408f48 B 7cd4d49a7fe7d24a715192112a2170bdd708e6c7 @@ -1183,6 +1184,7 @@ B b0e8d1dff6777567653003c23800e98fca53890d B b0f9492ba1792247a9370f9ec132a646bf77e6e3 B b10f022f08e8a9cc24d8ecd960fbccd971ee3d27 B b1227d6ae33cc3e33a6685933f4c7ec51da3bd95 +B b12af728a7f136c412ee07ea64616a216a63fd00 B b13a8a7a63e549d61ed97529de1e5dfc4bec7a3f B b13d37d92e3105298b55e3fbfee0c9d077e0817c B b15852b997837fde82b0aaa30f05f1c56dc7a7a5 @@ -1396,6 +1398,7 @@ B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d0e42861b5df45cf24985d956372f75bf04800f3 B d0fb61f798561c4e24e283672e317e7eaaec0ede B d1687e70dc8b0e8571cc7dfebbd173ec1ccb1c32 +B d199643a412020492967ed09d96dfdb0ce0265e2 B d1b2a3d0ab6368ae519498572b72267388859635 B d1bb6c14ce0e9431adedc324bcf069209d9fe4d8 B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
