#
303975 |
|
11-Aug-2016 |
gjb |
Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, and rename it to RC1.
Update __FreeBSD_version.
Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and the dvd1.iso packages population.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
302408 |
|
08-Jul-2016 |
gjb |
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, as nothing has been merged here.
Additional commits post-branch will follow.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
|
#
298658 |
|
26-Apr-2016 |
bhd |
Remove redundant word.
Reviewed by: bjk, bcr Differential Revision: https://reviews.freebsd.org/D6064
|
#
296204 |
|
29-Feb-2016 |
trasz |
tzsetup(1) -> tzsetup(8)
MFC after: 1 month Sponsored by: The FreeBSD Foundation
|
#
288380 |
|
29-Sep-2015 |
bdrewery |
Document the post-merge actions of calling tzsetup(8) and services_mkdb(8) added in r259134.
MFC after: 3 days
|
#
281887 |
|
23-Apr-2015 |
jhb |
Reassign copyright statements on several files from Advanced Computing Technologies LLC to Hudson River Trading LLC.
Approved by: Hudson River Trading LLC (who owns ACT LLC) MFC after: 1 week
|
#
273834 |
|
29-Oct-2014 |
jhb |
Rework the EXAMPLES section to be a bit clearer. - Add an example of using etcupdate diff. - Create a subsection on bootstrapping that is below the simple examples. This should make it clearer that 'etcupdate extract' is a one-time operation and not part of the common workflow. It also adds more suggestions on when bootstrapping is needed and additional steps to make future merges simpler.
Reviewed by: adrian MFC after: 3 days
|
#
267668 |
|
20-Jun-2014 |
bapt |
use .Mt to mark up email addresses consistently (part2)
PR: 191174 Submitted by: Franco Fichtner <franco@lastsummer.de>
|
#
259134 |
|
09-Dec-2013 |
jhb |
- Refresh /etc/localtime after each update using tzsetup -r. - Regenerate /var/db/services.db when /etc/services changes.
MFC after: 1 week
|
#
258066 |
|
12-Nov-2013 |
jhb |
Add a pre-world mode of updating similar to the -p option that can be passed to mergemaster. In this mode, only changes to /etc/master.passwd and /etc/group are merged to /etc. In addition, it uses a temporary tree to stage these changes rather than overwriting the existing 'current' and 'previous' trees so that a full update can be run after a normal installworld has completed.
MFC after: 2 weeks
|
#
258064 |
|
12-Nov-2013 |
jhb |
Sort option flags and fix the width of the options list. This is a purely mechanical change, no content changes.
|
#
238428 |
|
13-Jul-2012 |
joel |
Add HISTORY section.
|
#
238426 |
|
13-Jul-2012 |
joel |
Minor mdoc, spelling and end of line whitespace fixes.
|
#
238423 |
|
13-Jul-2012 |
jhb |
The etcupdate utility is a tool for managing updates to files that are not updated as part of `make installworld' such as files in /etc. It manages updates by doing a three-way merge of changes made to these files against the local versions. It is also designed to minimize the amount of user intervention with the goal of simplifying upgrades for clusters of machines.
The primary difference from mergemaster is that etcupdate requires less manual work. The primary difference from etcmerge is that etcupdate updates files in-place similar to mergemaster rather than building a separate /etc tree.
Requested by: obrien, kib, theraven, joeld (among others)
|