Skip to content

Commit ca667ba

Browse files
committed
Merge branch 'master' of github.com:DataDog/dd-trace-php into bob/windows
2 parents 25e063e + 7da29d0 commit ca667ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1531
-909
lines changed

.gitlab/benchmarks.yml

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ benchmarks-tracer:
5858
- zend_abstract_interface/**/*
5959
- tests/Benchmarks/**/*
6060
- benchmark/*
61+
- tea/**/*
6162
compare_to: "master"
6263
when: on_success
6364
- when: manual

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
[submodule "appsec/third_party/libddwaf"]
1212
path = appsec/third_party/libddwaf
1313
url = https://github.com/DataDog/libddwaf.git
14+
[submodule "tea/benchmarks/google-benchmark"]
15+
path = tea/benchmarks/google-benchmark
16+
url = https://github.com/google/benchmark.git

0 commit comments

Comments
 (0)