Skip to content

Commit c4c868e

Browse files
M-TsurM-Tsur
authored
Merge branch 'cloudfoundry:main' into re-enable-takipi
2 parents 711a1cb + ba66915 commit c4c868e

File tree

18 files changed

+213
-140
lines changed

18 files changed

+213
-140
lines changed

‎.rubocop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,7 @@ Lint/RedundantCopDisableDirective:
7171
Enabled: false # disabled as this can be tough to manage across multiple ruby versions
7272
Style/RedundantFreeze:
7373
Enabled: false # enable when we only support ruby 3.0+
74+
Naming/BlockForwarding:
75+
Enabled: false # enable when we only support Ruby 3.1+
76+
Style/HashSyntax:
77+
EnforcedShorthandSyntax: either

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ The buildpack supports extension through the use of Git repository forking. The
140140
* [Riverbed AppInternals Agent](docs/framework-riverbed_appinternals_agent.md) ([Configuration](docs/framework-riverbed_appinternals_agent.md#configuration))
141141
* [Sealights Agent](docs/framework-sealights_agent.md) ([Configuration](docs/framework-sealights_agent.md#configuration))
142142
* [Seeker Security Provider](docs/framework-seeker_security_provider.md) ([Configuration](docs/framework-seeker_security_provider.md#configuration))
143+
* [Splunk Observability Cloud](docs/framework-splunk_otel_java_agent.md) ([Configuration](docs/framework-splunk_otel_java_agent.md#user-provided-service))
143144
* [Spring Auto Reconfiguration](docs/framework-spring_auto_reconfiguration.md) ([Configuration](docs/framework-spring_auto_reconfiguration.md#configuration))
144145
* [Spring Insight](docs/framework-spring_insight.md)
145146
* [SkyWalking Agent](docs/framework-sky_walking_agent.md) ([Configuration](docs/framework-sky_walking_agent.md#configuration))

‎bin/compile

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎bin/compile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./run

‎bin/detect

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎bin/detect

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./run

‎bin/finalize

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎bin/finalize

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./run

‎bin/release

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎bin/release

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./run

0 commit comments

Comments
 (0)