From 9f8281e6512a6896e190a71746e23800e3e99e63 Mon Sep 17 00:00:00 2001
From: Trent Mick <trentm@gmail.com>
Date: Wed, 20 Jun 2012 17:02:43 -0700
Subject: [PATCH] changelog entries for dap's additions

---
 AUTHORS    |  5 +++--
 CHANGES.md | 31 ++++++++++++++++++++++++++++++-
 README.md  |  1 -
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 88c1589..af1421b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
-Trent Mick <trentm@gmail.com>
-Mark Cavage <mcavage@gmail.com>
+Trent Mick <trentm@gmail.com> (http://trentm.com)
+Mark Cavage <mcavage@gmail.com> (https://github.com/mcavage)
+Dave Pacheco <dap@joyent.com> (https://github.com/davepacheco)
diff --git a/CHANGES.md b/CHANGES.md
index 60386ab..08e797a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,33 @@
 
 ## bunyan 0.9.0 (not yet released)
 
+- [pull #15] The `bunyan` CLI will now chronologically merge multiple log
+  streams when it is given multiple file arguments. (by github.com/davepacheco)
+
+        $ bunyan foo.log bar.log
+        ... merged log records ...
+
+- [pull #15] A new `bunyan.RingBuffer` stream class that is useful for
+  keeping the last N log messages in memory. This can be a fast way to keep
+  recent, and thus hopefully relevant, log messages. (by @dapsays,
+  github.com/davepacheco)
+
+  Potential uses: Live debugging
+  if a running process could inspect those messages. One could dump recent
+  log messages at a finer log level than is typically logged on
+  [`uncaughtException`](http://nodejs.org/docs/latest/api/all.html#all_event_uncaughtexception).
+
+        var ringbuffer = new bunyan.RingBuffer({ limit: 100 });
+        var log = new bunyan({
+            name: "foo",
+            raw: true,
+            stream: ringbuffer,
+            level: "debug"
+        });
+
+        log.info('hello world');
+        console.log(ringbuffer.entries);
+
 - Add support for "raw" streams. This is a logging stream that is given
   raw log record objects instead of a JSON-stringified string.
 
@@ -17,7 +44,9 @@
             raw: true
         });
 
-  See "examples/raw-stream.js".
+  See "examples/raw-stream.js". I expect raw streams to be useful for
+  piping Bunyan logging to separate services (e.g. <http://log.ly>,
+  <https://github.com/etsy/statsd>) or to separate in-process handling.
 
 - Add test/corpus/*.log files (accidentally excluded) so that test suite
   works(!).
diff --git a/README.md b/README.md
index 075181d..54d3714 100644
--- a/README.md
+++ b/README.md
@@ -488,7 +488,6 @@ This example emits:
 
     [ { name: 'foo',
         hostname: '912d2b29',
-        raw: true,
         pid: 50346,
         level: 30,
         msg: 'hello world',