Skip to content

Commit

Permalink
* Update default root list to latest
Browse files Browse the repository at this point in the history
 * ARM32 platform build and flag fixes
 * Add a clarification line to LICENSE.txt
 * Fix license message in CLI
 * Windows service now looks for service command line arguments
 * Fixed a bug that could cause excessive queued multicasts
  • Loading branch information
adamierymenko committed Sep 5, 2019
1 parent 8454a14 commit 0767ea5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
7 changes: 5 additions & 2 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ ZeroTier Release Notes

# 2019-08-30 -- Version 1.4.6

* Update default root list to new roots
* ARM32 platform fixes
* Update default root list to latest
* ARM32 platform build and flag fixes
* Add a clarification line to LICENSE.txt
* Fix license message in CLI
* Windows service now looks for service command line arguments
* Fixed a bug that could cause excessive queued multicasts

# 2019-08-23 -- Version 1.4.4

Expand Down
8 changes: 1 addition & 7 deletions make-linux.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Automagically pick clang or gcc, with preference for clang
# Automagically pick CLANG or RH/CentOS newer GCC if present
# This is only done if we have not overridden these with an environment or CLI variable
ifeq ($(origin CC),default)
CC:=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi)
Expand All @@ -18,9 +18,6 @@ include objects.mk
ONE_OBJS+=osdep/LinuxEthernetTap.o
ONE_OBJS+=osdep/LinuxNetLink.o

NLTEST_OBJS+=osdep/LinuxNetLink.o node/InetAddress.o node/Utils.o node/Salsa20.o
NLTEST_OBJS+=nltest.o

# for central controller builds
TIMESTAMP=$(shell date +"%Y%m%d%H%M")

Expand Down Expand Up @@ -344,9 +341,6 @@ debug: FORCE
make ZT_DEBUG=1 one
make ZT_DEBUG=1 selftest

nltest: $(NLTEST_OBJS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o nltest $(NLTEST_OBJS) $(LDLIBS)

# Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
# provide backward compatibility with old releases where the binaries actually
# lived here. Folks got scripts.
Expand Down

0 comments on commit 0767ea5

Please sign in to comment.