4121 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Ierymenko	77ce238457	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev	2017-07-17 17:02:57 -07:00
Adam Ierymenko	1685659e37	Remote tracing works.	2017-07-17 17:02:50 -07:00
Grant Limberg	0f03d4ef51	Update Jenkinsfile for new NDK in Jenkins	2017-07-17 16:55:00 -07:00
Grant Limberg	bcf697cc2b	Wire up PortMapper in Android ... Enables UPnP port mapping for Android client on networks with UPnP routers	2017-07-17 16:16:25 -07:00
Adam Ierymenko	5e2ea4a81a	Cleanup.	2017-07-17 14:24:57 -07:00
Adam Ierymenko	b9e1d53d7a	Minor cleanup.	2017-07-17 14:21:09 -07:00
Adam Ierymenko	ab0806a036	Cleanup.	2017-07-17 13:48:39 -07:00
Adam Ierymenko	3a1ec07db0	Remove some exception copypasta.	2017-07-17 10:43:28 -07:00
Adam Ierymenko	d939d8d21d	A bit more remote tracing stuff.	2017-07-14 14:57:40 -07:00
Adam Ierymenko	d9552fb120	Add remoteTraceTarget to network and member configs in controller.	2017-07-14 14:33:36 -07:00
Adam Ierymenko	4ecc0c59ca	Plumbing through of remote trace into controller code.	2017-07-14 13:03:16 -07:00
Adam Ierymenko	0655a1fcbe	Move old cluster code into attic.	2017-07-13 16:42:43 -07:00
Adam Ierymenko	c8d0cf2c40	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2017-07-13 16:31:30 -07:00
Adam Ierymenko	c692f2e740	Fix for new identity generation bug.	2017-07-13 16:31:16 -07:00
Alex	a83c7c0d07	remove debugging flag	2017-07-13 15:13:20 -07:00
Adam Ierymenko	ba6fd16823	More tracing stuff.	2017-07-13 15:08:57 -07:00
Adam Ierymenko	54893c35c1	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev	2017-07-13 10:51:19 -07:00
Adam Ierymenko	495c5ce81d	Bunch of remote tracing work.	2017-07-13 10:51:05 -07:00
Grant Limberg	4cc773ec1b	fix Windows build	2017-07-12 13:52:45 -07:00
Grant Limberg	69ae35494e	put the correct file extensions on data written to disk in JNI	2017-07-12 13:36:22 -07:00
Grant Limberg	512c3af4ea	fix packet sending functions	2017-07-12 13:12:45 -07:00
Grant Limberg	d8f1c3dff7	Update JNI code to reflect new ZeroTier API	2017-07-12 11:34:53 -07:00
Grant Limberg	0a11dd2d24	Fix NeighborDiscovery code now that ZT_SOCKADDR_NULL doesn’t exist	2017-07-11 15:45:36 -07:00
Monty A	78ee7f6573	Peer's role misses a PLANET role ... Peer's role misses a PLANET role in documentation vs what's returned from API.	2017-07-09 15:39:49 +01:00
Adam Ierymenko	dab0fb9e05	Remote trace: plumbing, replace old TRACE with calls to Trace object.	2017-07-07 16:58:05 -07:00
Adam Ierymenko	e14d5d49a1	Merge branch 'master' into dev	2017-07-07 09:36:54 -07:00
Adam Ierymenko	782b2b1514	Merge pull request #537 from laduke/patch-1 ... Update README.md	2017-07-07 09:32:37 -07:00
Adam Ierymenko	a9582417e2	Merge pull request #547 from surgicalcoder/patch-1 ... Clarification on how to use JSON API with secret	2017-07-07 09:32:23 -07:00
Adam Ierymenko	69922b6c39	BSD build fix.	2017-07-07 09:29:24 -07:00
Adam Ierymenko	6fc70f7c16	More cleanup, Linux build fixes.	2017-07-07 06:50:40 -07:00
Monty A	a274e774ee	Clarification on how to use JSON API with secret ... Makes it clear on how to use the authtoken.secret file when making requests.	2017-07-07 10:11:21 +01:00
Adam Ierymenko	f23a43fb81	More cleanup.	2017-07-06 17:32:41 -07:00
Adam Ierymenko	88997a0314	Windows build fixes.	2017-07-06 16:29:11 -07:00
Adam Ierymenko	d2415dee00	Cleanup.	2017-07-06 16:11:11 -07:00
Adam Ierymenko	53728b79b4	.	2017-07-06 12:35:23 -07:00
Adam Ierymenko	dff8c02cfe	Pull out and deprecate old cluster code. New cluster code will not be merged yet.	2017-07-06 12:33:00 -07:00
Adam Ierymenko	640ad577d1	.	2017-07-06 11:56:46 -07:00
Adam Ierymenko	cd63ecd3f3	.	2017-07-06 11:45:48 -07:00
Adam Ierymenko	f18158a52d	.	2017-07-06 11:45:22 -07:00
Adam Ierymenko	84748aab51	Merge branch 'dev' into edge	2017-07-06 10:26:04 -07:00
Adam Ierymenko	3fadc64ee0	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev	2017-07-06 10:25:58 -07:00
Adam Ierymenko	47594f7c99	Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge	2017-07-06 10:25:44 -07:00
Adam Ierymenko	2f20258807	.	2017-07-06 10:25:36 -07:00
Grant Limberg	47122a3804	Merge branch 'dev' into edge	2017-07-03 13:29:54 -07:00
Grant Limberg	1730f8f5b7	also cluster.hpp	2017-07-03 13:04:11 -07:00
Grant Limberg	d258a75cd3	remove Cluster.cpp from build list as it's been removed	2017-07-03 13:03:43 -07:00
Adam Ierymenko	baa10c2995	.	2017-06-30 17:32:07 -07:00
Grant Limberg	207d6572e0	fix for changelist posting to mattermost	2017-06-30 14:24:40 -07:00
Grant Limberg	10264cec2f	slackSend -> mattermostSend	2017-06-30 13:43:39 -07:00
Adam Ierymenko	0ea1749c59	Merge pull request #540 from skunkwerks/master ... build: all BSDs expect gmake here	2017-06-30 09:55:43 -07:00