Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2999D200C55 for ; Wed, 29 Mar 2017 14:36:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2841D160B7C; Wed, 29 Mar 2017 12:36:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 70D43160B95 for ; Wed, 29 Mar 2017 14:36:22 +0200 (CEST) Received: (qmail 55111 invoked by uid 500); 29 Mar 2017 12:36:21 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 55043 invoked by uid 99); 29 Mar 2017 12:36:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Mar 2017 12:36:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 69EF4DFF36; Wed, 29 Mar 2017 12:36:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Wed, 29 Mar 2017 12:36:23 -0000 Message-Id: <28faca9404654eb48b0652865c06fe55@git.apache.org> In-Reply-To: <5979f61d48334d40b2508c8323c55678@git.apache.org> References: <5979f61d48334d40b2508c8323c55678@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Recording .gitmergeinfo Changes archived-at: Wed, 29 Mar 2017 12:36:23 -0000 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/84ae1490 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/84ae1490 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/84ae1490 Branch: refs/heads/3.0.x-fixes Commit: 84ae1490a4a628e0b3d795cc13b27d41205fc8d1 Parents: ca24a9c Author: Daniel Kulp Authored: Wed Mar 29 08:36:15 2017 -0400 Committer: Daniel Kulp Committed: Wed Mar 29 08:36:15 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/84ae1490/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 32e61c2..1079e6d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -157,6 +157,7 @@ B 18f06322f8e14ca7e7ffed682851c8448181cd2c B 194224faeb3e8eb6c8feabe6397f6b42ff0f605d B 194694aa38500a6b0042f97e1cafd742126bf527 B 194f9cd98da50140e8184ff4835811875aa5ecfe +B 1960082af04b913d30adf187b8395092196d15cc B 1960703149a11052490cf16ec3682408470298f9 B 19cbe748cf0753671e50a643d845a5700c53777b B 19ebf83eff810328e2dc8fd174bf1d4ea992141f @@ -247,6 +248,7 @@ B 27398c0edc71cabb40180cb1d88eb3cd92afa91c B 2741e4a4d763617df2149736a716e589fffcc8b8 B 27917f3accef78556fa7ed8e79f1746052bfd4d9 B 27a95f050bfdbeb9d3e63af11fc2e8c4370ae549 +B 27ae9979b88540574ee59c487f43c20c877c8be3 B 27c2c25dc3c2c3019543e31afdca7b166911f278 B 280487512eb1c34a6c05bcfe3e2e182388359a25 B 28054f8aa4a3d208ad7ddadef6f11f692be6787b @@ -414,6 +416,7 @@ B 3ec5957b01821138129cc29acb88430fa278d28e B 3ee69e9404d3ffed74e84b223d7d284c081f7fb4 B 3f57636a454757504055ab0973ec2a461fb954be B 3f90fa6a7adb9c3311663424950fa352d7d5bdbb +B 3fd465a1b74c19e819a794ff89227af2c0d268f5 B 402e89f5fdf5ef07cbee449912fd920c727c1886 B 40356fc6b033def4adf817453a483939a249e85d B 40b19d7f6f1877f6c2c397548a4e24582c053706 @@ -1683,6 +1686,7 @@ M 1875a1c2f8c3290e5f3d92d9eab266bb106d6cea M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 1946e323a0df6e5f9748af82106cff39d7b5d01f M 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0 +M 1a4c2ac162b2b67b14e8ad12b06ca87e443dccc4 M 1b5e4078c3b14cf249f39607b1bb2b676d236747 M 1b91b6e630bec0980d94bd04b016748af525d9bd M 1baae69592a128462ef252916bccfb67cd81095b