summaryrefslogtreecommitdiffstats
path: root/etc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2017-02-091-0/+8
|\
| * MFC r310467:ngie2017-02-041-0/+8
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2017-01-093-50/+71
|\ \ | |/
| * MFstable/11 r310875:ngie2016-12-301-47/+50
| * MFC 308664,308742,308743sephe2016-12-292-0/+18
| * MFstable/11 r310567:ngie2016-12-261-3/+3
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-12-052-1/+3
|\ \ | |/
| * MFC r299704:ngie2016-12-031-0/+2
| * MFC r307755: swapoff: Remove only late devices with -aL.jilles2016-11-201-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-11-164-3/+75
|\ \ | |/
| * MFC r297207:trasz2016-11-041-2/+2
| * MFC r307182,307191,307192: rc.d/zfsbe: new script designed for BE supportavg2016-11-033-1/+73
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-10-121-5/+17
|\ \ | |/
| * MFC r297314: rc.d: Make msgs a proper rc.d script.jilles2016-10-091-5/+17
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-10-062-2/+2
|\ \ | |/
| * MFC r306048asomers2016-10-032-2/+2
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-09-121-1/+1
|\ \ | |/
| * MFC r304162asomers2016-09-121-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-08-302-6/+25
|\ \ | |/
| * MFC r304779, r304780, r304781, r304782, r304802cy2016-08-272-6/+25
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-08-081-6/+7
|\ \ | |/
| * MFC r303160.cy2016-07-271-6/+7
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-07-192-18/+26
|\ \ | |/
| * MFC r302857:jamie2016-07-171-3/+6
| * MFC r302855:jamie2016-07-171-15/+16
| * MFC r300356asomers2016-07-111-0/+4
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-06-211-0/+2
|\ \ | |/
| * MFC r299529,r299540,r299576,r299896:mm2016-06-171-0/+2
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-06-1413-13/+17
|\ \ | |/
| * MFC r301683:ngie2016-06-111-1/+1
| * MFC r301295:cy2016-06-101-2/+1
| * MFC r299844,r300931:ngie2016-06-082-2/+2
| * MFC r299843:ngie2016-06-082-1/+2
| * MFC r299839,r299840,r299841:ngie2016-06-086-5/+9
| * MFC r301102:cy2016-06-081-2/+2
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-06-063-8/+10
|\ \ | |/
| * Add missing file from r301145asomers2016-06-021-0/+2
| * MFC r300180:cy2016-06-011-6/+6
| * MFC r300638:cy2016-05-281-2/+2
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-05-231-1/+1
|\ \ | |/
| * MFC: r299242rmacklem2016-05-221-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-05-166-6/+7
|\ \ | |/
| * MFC r298881, 298882, 298883, 298885:pfg2016-05-154-5/+5
| * MFC r298844:ngie2016-05-132-1/+2
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-05-091-4/+20
|\ \ | |/
| * MFC r298783:hselasky2016-05-091-4/+20
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-05-032-2/+9
|\ \ | |/
| * MFC r295471:jamie2016-04-302-2/+9
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-04-281-2/+0
|\ \ | |/
| * MFC r298516:jamie2016-04-281-2/+0
OpenPOWER on IntegriCloud