(cxf) 03/03: Recording .gitmergeinfo Changes

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 21f20206c3079613fb218d7339db5d6f709ce68b
Author: Andriy Redko 
AuthorDate: Fri Jan 26 15:31:39 2024 -0500

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3d7edb3b72..bf1f826de5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -414,6 +414,7 @@ B f5a6168a4daa1187838947755a967ae8e72e103c
 B f8c09f8234a9a546a0ca7ef8368a31bfe43fdf61
 B f8eb1117e349945430fe10a21e6219aa12adc8bb
 B f9d272c208829a8d6412ae255a1f9ca880c4f7b1
+B fa06963acc949948b17c8ecfa7f63996bf0b1766
 B fa2c872e46f91fea091e52f1b166d825002ec7df
 B fa887167b0a17efcb5b5764d6b00bf48b73527c6
 B fb1e610b55bdc534485b98f12db3e88228062feb



(cxf) 01/03: Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 (#1666)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 2dd8cb1957c211156de7ccf906a2a65cb68e127c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 26 08:20:08 2024 -0500

Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 (#1666)

Bumps 
[io.github.openfeign:feign-httpclient](https://github.com/openfeign/feign) from 
13.1 to 13.2.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.1...13.2)

---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-httpclient
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit b1d605d387e08dc360fff377b3f1bffb92933f91)

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
(cherry picked from commit 4008208a51aff3a8ee0a4c3009bbf16b5f3fa959)
---
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index c651d56119..9131f96bc6 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -135,7 +135,7 @@
 
 io.github.openfeign
 feign-httpclient
-13.1
+13.2
 
 
 io.github.openfeign.opentracing
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index fa8affb6cc..eac978283e 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -139,7 +139,7 @@
 
 io.github.openfeign
 feign-httpclient
-13.1
+13.2
 
 
 io.github.openfeign.opentracing



(cxf) branch 3.5.x-fixes updated (29351a195c -> 21f20206c3)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 29351a195c Recording .gitmergeinfo Changes
 new 2dd8cb1957 Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 
(#1666)
 new b8854e04da Bump io.github.openfeign:feign-core from 13.1 to 13.2 
(#1664)
 new 21f20206c3 Recording .gitmergeinfo Changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo | 1 +
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 ++--
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)



(cxf) 02/03: Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit b8854e04dafc08772c4b96170f064afecc73b8d1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 26 08:20:23 2024 -0500

Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)

Bumps [io.github.openfeign:feign-core](https://github.com/openfeign/feign) 
from 13.1 to 13.2.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.1...13.2)

---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 99bc15385a1d53b9c630e15cea8b417eae5601e1)

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
(cherry picked from commit 81b56850bb905dfda3eb3c0d9be4ee5c1165227f)
---
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 9131f96bc6..1f7af88705 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -130,7 +130,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index eac978283e..3557681b1a 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -134,7 +134,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign



(cxf) 03/03: Recording .gitmergeinfo Changes

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit fa06963acc949948b17c8ecfa7f63996bf0b1766
Author: Andriy Redko 
AuthorDate: Fri Jan 26 15:29:45 2024 -0500

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6914866340..11362c76c1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -600,6 +600,7 @@ M 98be30e6813d3c9f6e49c4a21c5ca7e46fada082
 M 9900e83b5970c32d40b797584d5cf6739952a97f
 M 990d3332d34fbfff4291256d0cd5eadedb510bc2
 M 9940e0e4c04fdeba84d2e34b66437dcb9d6ad5d7
+M 99bc15385a1d53b9c630e15cea8b417eae5601e1
 M 99dbd2a5924ae165fb46d12a6365f5c89bf65f0e
 M 9a36be5c61b1992247f7fdb416a4f0bb10f9c1d9
 M 9a7614a9d827f57f58da9696cc53b18c722c7d98
@@ -664,6 +665,7 @@ M b12b9319e5b563814f20879f29e12fbe25a95258
 M b15e3580e8f8692b2ffd51e6b2c44ce9dd8a5730
 M b1a512265c4a646912ec057eff24eb269e7bfe26
 M b1c647659ad5df3c21e83b670fb7ea0ff3dbe889
+M b1d605d387e08dc360fff377b3f1bffb92933f91
 M b207c718e84bed8120bb114f1d79f575094c3a14
 M b2a41f877800a811699740c1ad68f8f10d8fafed
 M b2ee30f1728dba63ebf27b2bbae2836d633ccb42
@@ -854,6 +856,7 @@ M f65444b0036e6f490eec97dfc4f22c125c3fbadb
 M f66d6216e6c62423f61351ba2dc65a0e5aabfb6b
 M f72118971428a059b94f3ee4c0730c95d5f1c192
 M f756c887ffd822f416d530a780d7c03f612b44b8
+M f862855c128a0a4b7bd75158f23ec553cb20ca9c
 M f8c6de43e8fd66ce11d8c8d15fa709f5e4020921
 M f8c8dabe62b2ce695f1923cd027a016bbcedb809
 M f8d3ff37be721f773723ee820761fe266af071b6



(cxf) 01/03: Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 (#1666)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 4008208a51aff3a8ee0a4c3009bbf16b5f3fa959
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 26 08:20:08 2024 -0500

Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 (#1666)

Bumps 
[io.github.openfeign:feign-httpclient](https://github.com/openfeign/feign) from 
13.1 to 13.2.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.1...13.2)

---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-httpclient
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit b1d605d387e08dc360fff377b3f1bffb92933f91)

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
---
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 56fd8ffef8..ea1be8e0e5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -135,7 +135,7 @@
 
 io.github.openfeign
 feign-httpclient
-13.1
+13.2
 
 
 io.github.openfeign.opentracing
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index c00f0385ab..cb22a6f3c6 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -139,7 +139,7 @@
 
 io.github.openfeign
 feign-httpclient
-13.1
+13.2
 
 
 io.github.openfeign.opentracing



(cxf) 02/03: Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 81b56850bb905dfda3eb3c0d9be4ee5c1165227f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 26 08:20:23 2024 -0500

Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)

Bumps [io.github.openfeign:feign-core](https://github.com/openfeign/feign) 
from 13.1 to 13.2.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.1...13.2)

---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 99bc15385a1d53b9c630e15cea8b417eae5601e1)

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
---
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index ea1be8e0e5..8da13f1376 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -130,7 +130,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index cb22a6f3c6..24a176d06d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -134,7 +134,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign



(cxf) branch 3.6.x-fixes updated (19276be9d4 -> fa06963acc)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 19276be9d4 Recording .gitmergeinfo Changes
 new 4008208a51 Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 
(#1666)
 new 81b56850bb Bump io.github.openfeign:feign-core from 13.1 to 13.2 
(#1664)
 new fa06963acc Recording .gitmergeinfo Changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo | 3 +++
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 ++--
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)



(cxf) branch dependabot/maven/io.github.openfeign-feign-core-13.2 deleted (was a51d526c33)

2024-01-26 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/io.github.openfeign-feign-core-13.2
in repository https://gitbox.apache.org/repos/asf/cxf.git


 was a51d526c33 Bump io.github.openfeign:feign-core from 13.1 to 13.2

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(cxf) branch main updated: Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
 new 99bc15385a Bump io.github.openfeign:feign-core from 13.1 to 13.2 
(#1664)
99bc15385a is described below

commit 99bc15385a1d53b9c630e15cea8b417eae5601e1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 26 08:20:23 2024 -0500

Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)

Bumps [io.github.openfeign:feign-core](https://github.com/openfeign/feign) 
from 13.1 to 13.2.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.1...13.2)

---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
index ec9fd3b479..87a4e89692 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
@@ -130,7 +130,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 8eb4648a21..77a528e1fa 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -130,7 +130,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index f765d16edc..1a26460fab 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -134,7 +134,7 @@
 
 io.github.openfeign
 feign-core
-13.1
+13.2
 
 
 io.github.openfeign



(cxf) branch dependabot/maven/io.github.openfeign-feign-micrometer-13.2 deleted (was 98cf68a4dc)

2024-01-26 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/io.github.openfeign-feign-micrometer-13.2
in repository https://gitbox.apache.org/repos/asf/cxf.git


 was 98cf68a4dc Bump io.github.openfeign:feign-micrometer from 13.1 to 13.2

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(cxf) branch dependabot/maven/io.github.openfeign-feign-httpclient-13.2 deleted (was e6ec68c435)

2024-01-26 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/io.github.openfeign-feign-httpclient-13.2
in repository https://gitbox.apache.org/repos/asf/cxf.git


 was e6ec68c435 Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(cxf) branch main updated (b1d605d387 -> f862855c12)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


from b1d605d387 Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 
(#1666)
 add f862855c12 Bump io.github.openfeign:feign-micrometer from 13.1 to 13.2 
(#1665)

No new revisions were added by this update.

Summary of changes:
 distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



(cxf) branch main updated (dc9b20d4df -> b1d605d387)

2024-01-26 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


from dc9b20d4df Bump cxf.dropwizard4.version from 4.2.24 to 4.2.25 (#1662)
 add b1d605d387 Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 
(#1666)

No new revisions were added by this update.

Summary of changes:
 distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)