Merge commit 'jrollins/master'

[monkeysphere.git] / doc / george / changelog

diff --git a/doc/george/changelog b/doc/george/changelog
index 22807d1410a5cd4c6d3bb2a26b486268b736e2de..aefbf7fe7c87da22a9fb057862b6681f2affd025 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,13 @@
 *  changes to this system                                                   *
 ******************************************************************************
 
+2008-06-22 - dkg
+       * installed screen (mjgoins and i were collaborating)
+       
+2008-06-21 - micah
+       * Restored /etc/init.d/ssh to original package state and changed
+       /etc/default/ssh to have 'unset SSHD_OOM_ADJUST' instead.
+       
 2008-06-20 - micah
        * Commented out the 'export SSHD_OOM_ADJUST=-17' from the
        /etc/init.d/ssh initscript, and the 'SSHD_OOM_ADJUST=-17' from
@@ -14,7 +21,7 @@
        "error writing /proc/self/oom_adj: Operation not permitted"
        (c.f. Debian #487325)
          
-200r-06-20 - dkg
+2008-06-20 - dkg
        * touched /etc/environment to get rid of some spurious auth.log
        entries.
        * turned up sshd's LogLevel from INFO to DEBUG