On 8/11/12 9:08 PM, Kevin Spargur wrote:
Ack, begin the merge wars :)
-Kevin
I went ahead and applied & pushed this. There were no merge troubles
(thank $deity). Cleaned up whitespaces before applying.
$ git apply /tmp/jeffnotes.patch
/tmp/jeffnotes.patch:26: trailing whitespace.
LD_PRELOAD, LD_AUDIT, and relative paths do not occur in a particular
set of initialization files.
/tmp/jeffnotes.patch:41: trailing whitespace.
The intent of the check is addressed effectively only by network traffic
filtering/inspection.
warning: 2 lines add whitespace errors.
$ git commit
[master 26b80bc] Jeff Blank: additional notes to document transition
from RHEL 5 STIG
1 files changed, 40 insertions(+), 5 deletions(-)
$ git push
Counting objects: 11, done.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 1.21 KiB, done.
Total 6 (delta 5), reused 0 (delta 0)
To ssh://shawndwells@git.fedorahosted.org/git/scap-security-guide.git
cc61c42..26b80bc master -> master