4300 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeff Becker	aea4542edd	more	2019-08-22 07:18:05 -04:00
Jeff	a4d2e0cddf	Merge remote-tracking branch 'origin/master'	2019-08-21 19:51:21 -04:00
Jeff Becker	3c3338e801	Merge remote-tracking branch 'origin/master' into memlink	2019-08-21 10:53:25 -04:00
michael-loki	3f868f2cdf	Merge pull request #782 from michael-loki/tidy_ensure_config ... replace endl with '\n in config.cpp	2019-08-20 01:57:20 +01:00
michael-loki	91f83ee9b4	Merge pull request #781 from michael-loki/update_rcutil ... Dump more info from router contact	2019-08-20 01:57:05 +01:00
Michael	cd27f96832	replace endl with '\n in config.cpp	2019-08-19 23:56:02 +01:00
Michael	7cb1b525c9	Dump more info from router contact	2019-08-19 23:25:46 +01:00
michael-loki	7b867b6648	Merge pull request #780 from michael-loki/replace_status_json ... Replace StatusObject with underlying JSON type	2019-08-19 23:25:24 +01:00
Michael	777261cb20	Use ToString over ToHex	2019-08-19 22:26:37 +01:00
Michael	afb94381a2	Use ToString instead	2019-08-19 22:06:30 +01:00
Jeff	d8e4f5e6fc	Merge pull request #779 from michael-loki/find_libatomic ... Find libatomic via cmake magics	2019-08-19 07:37:58 -04:00
Michael	094b697b01	Replace StatusObject with underlying JSON type	2019-08-19 10:33:26 +01:00
Michael	e7c48e57e9	Fix on compilers which aren't C++11 by default	2019-08-18 22:54:33 +00:00
Jeff	bbeb5480d6	Merge pull request #769 from michael-loki/compose_fixes ... docker-compose fixes	2019-08-18 11:22:57 -04:00
Jeff	7a55bb4ad9	Merge pull request #778 from michael-loki/fix_static_link ... Fix static linking on macOS	2019-08-18 11:22:08 -04:00
Michael	7dfbb41e0d	Find libatomic fix cmake magics	2019-08-17 13:20:16 +01:00
Michael	429284aedc	Fix static linking on macOS	2019-08-17 12:33:07 +01:00
michael-loki	2a09d4914a	Merge pull request #776 from michael-loki/travis_labels ... Give explicit names to builds so we know wtf failed	2019-08-14 23:39:49 +01:00
Michael	9b20cbb757	Give explicit names to builds so we know wtf failed	2019-08-14 21:52:10 +00:00
Jeff Becker	bcadb5d2f6	Merge remote-tracking branch 'origin/master'	2019-08-14 08:11:43 -04:00
Jeff	40e63c597f	Merge pull request #775 from michael-loki/fix_make_install ... Fix make install	2019-08-14 08:11:17 -04:00
Jeff Becker	8dac38fcdc	Merge remote-tracking branch 'origin/master'	2019-08-14 08:10:11 -04:00
Michael	0ff3b1e707	Fix make install	2019-08-14 12:01:34 +00:00
Jeff	ecf3c37d2e	Merge pull request #768 from majestrate/sane-limits ... Sane limits	2019-08-14 06:28:28 -04:00
Michael	931ec0d35f	docker-compose fixes	2019-08-14 00:31:28 +01:00
michael-loki	33922a739e	Merge pull request #774 from michael-loki/make_format_clang_8 ... Use the right version of clang-tidy	2019-08-13 23:51:41 +01:00
Michael	40aabd6d92	Use the right version of clang-tidy	2019-08-13 22:38:00 +01:00
Jeff Becker	28de66e964	correct header?	2019-08-13 11:29:44 -04:00
Jeff Becker	c14993bc56	use llarp::path::default_len to inform how many routers we need	2019-08-13 08:40:22 -04:00
Jeff	cf3a31fdd0	Merge pull request #770 from michael-loki/format_verify_fix ... Fix format verify	2019-08-13 08:36:31 -04:00
Jeff	84aa7ad156	Merge pull request #773 from michael-loki/fix_make_windows ... make windows fixes	2019-08-13 08:36:09 -04:00
Michael	ba446fce45	try with clang-format 7	2019-08-13 09:07:23 +00:00
Michael	6e5cab971f	make windows fixes	2019-08-13 10:02:48 +01:00
Michael	c246851729	Dump config	2019-08-13 09:01:26 +00:00
Jeff	b8eb9cdb2e	Merge pull request #772 from michael-loki/missing_header ... Add missing header	2019-08-12 20:36:25 -04:00
Michael	c98ae332b2	Add missing header	2019-08-13 00:26:25 +00:00
Jeff	6776b6099e	Merge pull request #771 from michael-loki/rcutil ... Update rcutil and add to build	2019-08-12 18:58:04 -04:00
Michael	0a1620aff2	make format	2019-08-12 22:10:07 +00:00
Michael	de21a2f687	Include json output	2019-08-12 22:09:44 +00:00
Michael	8c5bbcaeeb	Update rcutil and add to build	2019-08-12 21:47:30 +00:00
Michael	8a8833d0fd	Bump version of cxxopts	2019-08-12 21:44:10 +00:00
Michael	0b80216d11	Fix format verify	2019-08-12 21:07:56 +00:00
michael-loki	8c8af7465e	Merge pull request #693 from michael-loki/clang-tidy-pass2 ... Modernize llarp directory	2019-08-12 22:07:35 +01:00
Michael	16cdfbd5f0	clang-tidy modernize pass	2019-08-12 16:52:58 +01:00
Jeff	d4eef2747a	Merge pull request #748 from michael-loki/travis_make_windows ... Test make windows on macOS, and avoid timeouts	2019-08-12 09:34:25 -04:00
Jeff	7db93bfc0a	Merge pull request #760 from michael-loki/ci_formatter ... CI to catch missing `make format`	2019-08-12 09:33:19 -04:00
Jeff	23ffdf9286	Merge pull request #750 from michael-loki/docker-compose ... WIP on docker-compose workflow	2019-08-12 09:32:21 -04:00
Jeff Becker	4c9675ffe7	ensure timestamp is not in future	2019-08-12 09:26:35 -04:00
Jeff Becker	e3c8761cf5	pump to make stuff speed up if stuck	2019-08-12 09:22:48 -04:00
Jeff Becker	7fb7e783e6	merge	2019-08-12 09:21:43 -04:00