Merge branches 'cleanup' and 'services'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 1 Jan 2007 15:30:39 +0000 (15:30 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 1 Jan 2007 15:30:39 +0000 (15:30 +0000)
commitd167fc1b2599ab06f857e984fc203fd7f64f4c0a
treedcbd9976cd4d6a9a7bf4b279683ef741dde6c3c0
parent64cf222377512d2cbdc8d750420e11cc5ddecdbd
parent18ad89136e3fe5867da9f79885db0d2eba9ac061
parentbdc44f5b72f94c67274ffe8f68d28053d2de2874
Merge branches 'cleanup' and 'services'

* cleanup:
  server/admin: Fix tokenization of statistics output.
  Fix typos in messages.
  doc: Various small cleanups to tripe-admin.5.
  cleanup: Various simple whitespace changes.
  cleanup: Rename a few badly-chosen variables.

* services:
  doc: Document the services messages.
  admin: Implement the main job commands.
  admin: Implement job table infrastructure.
  admin: Service ownership infrastructure and commands.
  servutil: Implement version number comparison.
  admin: New ?TOKENS formatting directive.
  admin: Rename the unknown-service error.
  admin: Improve handling of background jobs.
  admin: Option parser macros.
  admin: Put all command options at the start of the command-line.
  admin: Fix premature close in a_bgrelease.
  admin: Remove locking; new safe client destruction.

Conflicts:

server/admin.c
doc/tripe-admin.5.in
server/admin.c
server/tripe.c