Ignore:
Timestamp:
Feb 10, 2011, 5:04:43 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
8050e8b
Parents:
e59e934 (diff), 6d1db7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Joe Ciccone <jciccone@…> (02/10/11 16:52:13)
git-committer:
Joe Ciccone <jciccone@…> (02/10/11 17:04:43)
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/general.ent
BOOK/introduction/common/changelog.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/materials/common/patches.xml

    re59e934 r2b687ad  
    119119
    120120    <varlistentry>
     121      <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
     122      <listitem>
     123        <para>Download: <ulink
     124        url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
     125        <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
     126      </listitem>
     127    </varlistentry>
     128
     129    <varlistentry>
    121130      <term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
    122131      <listitem>
Note: See TracChangeset for help on using the changeset viewer.