Commit Graph

279 Commits

Author SHA1 Message Date
C. Guy Yarvin
f4acd72d90 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-06-03 11:25:12 -07:00
~hatteb-mitlyd
4c51fa75ee crash when crude fails 2014-06-03 11:10:24 -07:00
C. Guy Yarvin
d57b87d94a Some vane cleanups, etc. 2014-06-02 22:07:32 -07:00
~hatteb-mitlyd
b76b207bd2 fix booting without checkpoint 2014-06-01 22:24:50 -07:00
~hatteb-mitlyd
dd0104dbce Add basic synclog code to try and track sync issues 2014-05-31 20:26:18 -07:00
~hatteb-mitlyd
c819b4c034 Merge remote-tracking branch 'origin/newbreach'
Update protocol for breach.

Conflicts:
	f/trac.c
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
	v/raft.c
2014-05-30 17:56:12 -07:00
Gavin Whelan
901c83799b Merge various changes 2014-05-30 16:13:44 -07:00
Gavin Whelan
9933bca9cf Merge and minor merge changes 2014-05-30 15:59:58 -07:00
~hatteb-mitlyd
b04775c002 remove old boot cruft 2014-05-30 15:05:47 -07:00
C. Guy Yarvin
8327419b78 Revert "Remove unused arms from arvo external core."
This reverts commit b754c2aeadbc8028a2e7989066dbbf08d2f293ef.
2014-05-30 14:51:28 -07:00
C. Guy Yarvin
4cbb1eeb18 Remove unused arms from arvo external core. 2014-05-30 14:45:41 -07:00
Gavin Whelan
97637ebe78 Merging clay fixes 2014-05-30 13:36:51 -07:00
C. Guy Yarvin
534e1a9090 Perfect GHETTO. 2014-05-30 12:47:47 -07:00
C. Guy Yarvin
bb4696d9aa Only the GHETTO can save the GHETTO. 2014-05-30 12:05:03 -07:00
C. Guy Yarvin
93bd99a4d2 GHETTO. 2014-05-30 11:44:08 -07:00
C. Guy Yarvin
f4e45a67ab GHETTO. 2014-05-30 11:43:48 -07:00
~hatteb-mitlyd
f97058f0b8 more profiling detritus
Conflicts:
	v/raft.c
2014-05-30 11:42:49 -07:00
~hatteb-mitlyd
b23c701c2a more profiling detritus 2014-05-30 11:09:47 -07:00
Gavin Whelan
eb4bd3c6cc Merge 2014-05-29 12:33:46 -07:00
~hatteb-mitlyd
3566984894 crappy punk-perf 2014-05-29 12:19:55 -07:00
Gavin Whelan
3d2cc3027d Merging merge 2014-05-28 12:26:16 -07:00
~hatteb-mitlyd
37e351528e wire up delete/get/put in cttp 2014-05-18 18:49:59 -07:00
~hatteb-mitlyd
24b82f00fd Merge remote-tracking branch 'urbit/master' into newbreach
pull in ssl fix
2014-05-16 15:53:23 -07:00
~hatteb-mitlyd
bf73cea511 SSL bios are freed by SSL_free 2014-05-16 15:52:11 -07:00
~hatteb-mitlyd
13e5b0966f Merge remote-tracking branch 'urbit/master' into newbreach
Conflicts:
	urb/urbit.pill

pill created from fakezod
2014-05-16 15:04:40 -07:00
~hatteb-mitlyd
cb4c01b32d sync toplevel files 2014-05-16 14:01:48 -07:00
~hatteb-mitlyd
e68a2a25d9 attempt to sync out files at toplevel 2014-05-16 14:01:48 -07:00
~hatteb-mitlyd
935e3dd063 SSL palliative 2014-05-15 12:55:30 -07:00
~hatteb-mitlyd
d118abb758 fix free in cttp 2014-05-14 15:12:04 -07:00
~hatteb-mitlyd
8823426918 fix _cttp_mcut_quay
the quay is no longer a map...
2014-05-14 13:22:29 -07:00
~hatteb-mitlyd
7881861296 sync palliative: check after block, not before 2014-05-13 16:34:09 -07:00
~hatteb-mitlyd
a1055f57cb sync palliative: don't assert, recreate 2014-05-13 16:32:44 -07:00
~hatteb-mitlyd
4daa9a6ed9 remove URBIT_HOME
New piers are structured as so:

cpu/.urb/{urbit.pill,chk,sis,get,put,code.~dansut-docfyn}
cpu/dansut-docfyn-dozzod-dozzod--dozzod-dozzod-dozzod-dozzod/{try,main,arvo}
2014-05-13 12:22:07 -07:00
~hatteb-mitlyd
43c3988995 add exit code to %logo card 2014-05-12 15:42:43 -07:00
~hatteb-mitlyd
3e869096b8 Merge remote-tracking branch 'urbit/master' into newbreach
Conflicts:
	urb/urbit.pill

Generate new pill.
2014-05-09 13:26:22 -07:00
~hatteb-mitlyd
4c967b2d60 avoid use-after-free in raft.c 2014-05-09 12:39:14 -07:00
Steve Dee
fab6bcdd80 Remove crya 2014-05-08 17:13:25 -07:00
~hatteb-mitlyd
8e56d82666 Merge remote-tracking branch 'urbit/master' into newbreach
Conflicts:
	urb/urbit.pill

Create a new pill.
2014-04-30 14:02:14 -07:00
~hatteb-mitlyd
e1a0cc1658 fix bogosity caused by uninitialized memory 2014-04-30 11:34:43 -07:00
Gavin Whelan
f77ac6a18c fixing bug in partially merged unix.c 2014-04-30 11:23:12 -07:00
Gavin Whelan
11a3d774a1 Removing hokey ^ jam file thing. 2014-04-30 10:43:01 -07:00
Steve Dee
3b7734336c Merge branch 'master' into newbreach
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
2014-04-25 18:39:29 -07:00
~hatteb-mitlyd
de79ff3fea fix cttp: body comes after cr-lf, not before 2014-04-24 14:08:51 -07:00
C. Guy Yarvin
0672685788 Remove some ames printfs; fix a warning. 2014-04-23 12:32:08 -07:00
C. Guy Yarvin
ff716a6122 Merge branch 'master' of github.com:urbit/urbit 2014-04-23 10:03:05 -07:00
C. Guy Yarvin
29ca4f9fe2 Fix ames timer to actually work. 2014-04-23 10:02:36 -07:00
Steve Dee
44cd26548b Merge branch 'master' into newbreach
Conflicts:
	urb/zod/arvo/ames.hoon
	v/sist.c
2014-04-21 19:06:16 -07:00
Steve Dee
65e9634db1 fsync after pack
Well, this might help. Apparently "useless" was a bit too strong a word.
2014-04-21 19:01:37 -07:00
Steven Dee
292156b2be Trivial self-healing log code 2014-04-22 01:53:03 +00:00
Steven Dee
36133b61e5 Fix printf 2014-04-19 01:42:07 +00:00