Skip to content

Commit 7b7d39b

Browse files
Merge pull request #2507 from zerotier/adam/1.16
V1.16 kitchen sink branch, 1.16 ready.
2 parents 86f402e + 3e6a22c commit 7b7d39b

File tree

182 files changed

+6842
-8348
lines changed

Some content is hidden

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

182 files changed

+6842
-8348
lines changed

.clangd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ CompileFlags:
44
- "-I../ext"
55
- "-I../ext/prometheus-cpp-lite-1.0/core/include"
66
- "-I../ext/prometheus-cpp-lite-1.0/simpleapi/include"
7+
- "-I../ext/opentelemetry-cpp-1.21.0/api/include"
78
- "-I./ext"
89
- "-I./ext/prometheus-cpp-lite-1.0/core/include"
910
- "-I./ext/prometheus-cpp-lite-1.0/simpleapi/include"
11+
- "-I./ext/opentelemetry-cpp-1.21.0/api/include"

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@
66
/zerotier
77
/nltest
88

9-
# IDE stuff
9+
# IDE and dev tool stuff
1010
/.idea
1111
/.nova
1212
/compile_commands.json
13+
/.claude
14+
/.aider
1315

1416
# OS-created garbage files from various platforms
1517
.DS_Store
1618
.Apple*
1719
Thumbs.db
1820
@eaDir
21+
lost+found
1922
._*
2023

2124
# Windows build droppings
@@ -58,6 +61,9 @@ zt1-src.tar.gz
5861
/MacEthernetTapAgent
5962

6063
# Miscellaneous temporaries, build files, etc.
64+
ext/installfiles/windows/*.back*.aip
65+
tcp-proxy/tcp-proxy
66+
rustybits/target
6167
*.log
6268
*.opensdf
6369
*.user
@@ -101,7 +107,6 @@ windows/ZeroTierOne/Debug/
101107
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
102108

103109
# Miscellaneous mac/Xcode droppings
104-
.DS_Store
105110
.Trashes
106111
*.swp
107112
*~.nib
@@ -126,18 +131,13 @@ workspace2/
126131
zeroidc/target/
127132
tcp-proxy/target
128133

129-
#snapcraft specifics
134+
# Snapcraft Linux build stuff
130135
/parts/
131136
/stage/
132137
/prime/
133-
134138
*.snap
135-
136139
.snapcraft
137140
__pycache__
138141
*.pyc
139142
*_source.tar.bz2
140143
snap/.snapcraft
141-
tcp-proxy/tcp-proxy
142-
rustybits/target
143-
ext/installfiles/windows/*.back*.aip

COPYING

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

0 commit comments

Comments
 (0)