From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 22 Jun 2008 04:22:42 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.2-1~12
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c911568316173454e5286c7253dc88f3fb5679e5;p=monkeysphere.git

Merge commit 'jrollins/master'
---

c911568316173454e5286c7253dc88f3fb5679e5
diff --cc doc/george/changelog
index 23ff007,ab97bf3..aefbf7f
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@@ -7,10 -7,18 +7,21 @@@
  *  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
+ 	/etc/default/ssh in order to make this error go away:
+ 	"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