summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "If there are any IPSEC security policies skip the tryforward step."Luiz Otavio O Souza2015-11-061-9/+0
* Fix a bad merge conflict resolution from c7275b999Renato Botelho2015-11-051-1/+0
* Merge branch 'stable/10' into develRenato Botelho2015-11-03727-26468/+22818
|\
| * MFC r285914, r289029 and r289560:hselasky2015-11-032-82/+81
| * MFC r289661:kib2015-11-031-1/+1
| * MFC r289660,r289664:kib2015-11-031-2/+13
| * MFC r289658:kib2015-11-031-1/+1
| * MFC r287413: Minor code cleanups (no functional changes).dteske2015-11-021-14/+12
| * MFC r287390: Bump version for altered long-opts processingdteske2015-11-021-1/+1
| * MFC r287389: Simplify long-option processingdteske2015-11-021-14/+10
| * MFC r287385: Bump version for prior fix (SVN r287381)dteske2015-11-021-1/+1
| * MFC r287384:dteske2015-11-021-1/+1
| * MFC r287383: Comment for escape() function.dteske2015-11-021-0/+8
| * MFC r287382: Commentdteske2015-11-021-1/+1
| * MFC r287381: Properly escape arguments when moving into jail or chrootdteske2015-11-021-1/+22
| * MFC r287380: Style: commentsdteske2015-11-021-4/+4
| * MFC r287379: Style consistency: add single space before each `;;' case entrydteske2015-11-021-19/+19
| * MFC r287378:dteske2015-11-021-12/+12
| * MFC r287421: Fix mandoc(1) "WARNING: end of line whitespace"dteske2015-11-021-15/+15
| * Snap to breuffer's r286660 (incorrectly merged)dteske2015-11-021-2/+0
| * MFC r287420: Remove non-functional examples.dteske2015-11-021-22/+1
| * MFC r287683: Ignore error results from newaliases(1)dteske2015-11-021-0/+2
| * MFC r287685: Remove use of return outside of functiondteske2015-11-021-1/+1
| * MFC r287686: Produce meaningful exit codedteske2015-11-021-1/+4
| * MFC r287687: Update copyrightsdteske2015-11-023-2/+3
| * MFC r287688: Explicitly exit with successdteske2015-11-021-1/+2
| * MFC r287689: Explicitly exit with successdteske2015-11-021-1/+2
| * MFC r287690: Produce meaningful exit codedteske2015-11-022-6/+14
| * MFC r287691: Remove trailing newline at EOFdteske2015-11-021-1/+0
| * MFC r287694: Use a variable for readabilitydteske2015-11-021-2/+2
| * MFC r287695: Replace `return' outside of function with exitdteske2015-11-021-1/+1
| * MFC r287692: Better to reset trap and explicitly exit successdteske2015-11-021-1/+2
| * MFC r287693: Update copyrightdteske2015-11-021-1/+1
| * MFC r287803: Fix code typo (no functional change)dteske2015-11-021-3/+3
| * MFC r287635: Fix argument quoting and remove unnecessary bracesdteske2015-11-025-63/+63
| * MFC r287696:dteske2015-11-021-3/+4
| * MFC r289790: dpv(3) merged to stable/10 before release/10.2.0dteske2015-11-021-1/+1
| * MFC r289793: Bump date/copyright after correcting HISTORYdteske2015-11-021-2/+2
| * MFC r289794: figpar(3) merged to stable/10 before release/10.2.0dteske2015-11-021-3/+3
| * MFC r290163: Ignore per-mdN settings in mdconfig[2] startupdteske2015-11-022-0/+4
| * MFC: r290121jkim2015-11-021-2/+10
| * MFC r289496:kib2015-11-021-5/+17
| * MFC r289229:ngie2015-11-012-5/+5
| * MFC: 289879bapt2015-10-312-16/+48
| * Long-overdue MFC of r280930:wollman2015-10-302-26/+26
| * MFC r289824:kib2015-10-302-0/+14
| * MFC r289823:kib2015-10-301-0/+12
| * MFC r289819: Fix LUN disable in CAM broken at r285155.mav2015-10-301-1/+1
| * MFC r287453,287454,288143:delphij2015-10-2945-257/+434
| * MFC r289038,r289041:delphij2015-10-296-78/+78
OpenPOWER on IntegriCloud