summaryrefslogtreecommitdiff
path: root/doc/devblog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-05 18:49:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-05 18:49:11 -0400
commitf50a5404c928a768ea0db6badd13e793a9a9481a (patch)
tree10ab18f2aff75de8dba83fb75a5b4256c6981075 /doc/devblog
parent07974a16ff00214883807949aa4d32c950af529a (diff)
reorder for clarity
Diffstat (limited to 'doc/devblog')
-rw-r--r--doc/devblog/day_128__release_prep.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/devblog/day_128__release_prep.mdwn b/doc/devblog/day_128__release_prep.mdwn
index 57f4e83a3..d43d2f877 100644
--- a/doc/devblog/day_128__release_prep.mdwn
+++ b/doc/devblog/day_128__release_prep.mdwn
@@ -1,8 +1,5 @@
Preparing for a release (probably tomorrow or Friday).
-Last night, did more work on the test suite, including even more checking
-of merge conflict resolution.
-
Part of that was updating the autobuilders. Had to deal with the gnutls
security hole fix, and upgrading that on the OSX autobuilder turned out to
be quite complicated due to library version skew. Also, I switched the
@@ -22,6 +19,9 @@ which can be disabled to prevent the assistant from doing the expensive
startup scan. This means it misses noticing any files that changed since it
last run, but this should be useful for those really big repositories.
+(Last night, did more work on the test suite, including even more checking
+of merge conflict resolution.)
+
----
Today's work was sponsored by Michael Alan Dorman.