aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump ntopng package versiondoktornotor2015-11-061-1/+1
* Bump ntopng package versiondoktornotor2015-11-061-1/+1
* Bump ntopng package versiondoktornotor2015-11-061-1/+1
* ntopng - unlink rc script when disabled to prevent it from starting on rebootdoktornotor2015-11-061-9/+13
* Merge pull request #1141 from doktornotor/patch-1Renato Botelho2015-11-061-4/+4
|\
| * Fix misplaced single quote, linebreaksdoktornotor2015-11-061-4/+4
|/
* Merge pull request #1140 from doktornotor/patch-1Renato Botelho2015-11-061-130/+187
|\
| * Add warnings about conflicting packages, some cleanupsdoktornotor2015-11-061-130/+187
|/
* Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-4/+0
* Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-2/+0
* Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
* Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-12/+0
* Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-10/+0
* Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
* Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-12/+0
* Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-10/+0
* Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
* Merge pull request #1098 from doktornotor/patch-1Renato Botelho2015-11-065-21/+170
|\
| * Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| * Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| * Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| * Mark conflicting packages as suchdoktornotor2015-10-151-0/+10
| * Mark conflicting packages as suchdoktornotor2015-10-151-0/+10
| * Mark conflicting packages as suchdoktornotor2015-10-151-0/+2
| * Mark conflicting packages as suchdoktornotor2015-10-151-0/+12
| * Mark conflicting packages as suchdoktornotor2015-10-151-0/+12
| * Mark conflicting packages as suchdoktornotor2015-10-151-0/+4
| * Bump squidGuard-squid3 package versiondoktornotor2015-10-151-1/+1
| * Bump squidGuard-squid3 package versiondoktornotor2015-10-151-1/+1
| * Bump squidGuard package versiondoktornotor2015-10-151-1/+1
| * Bump squidGuard package versiondoktornotor2015-10-151-1/+1
| * Bump squidGuard package versiondoktornotor2015-10-151-1/+1
| * Add privileges configuration to squidguard packagedoktornotor2015-10-151-16/+45
| * Add privileges configuration to squidguard packagedoktornotor2015-10-151-0/+55
* | Merge pull request #1139 from doktornotor/patch-6Renato Botelho2015-11-065-142/+189
|\ \
| * | Bump apache-mod_security-dev package versiondoktornotor2015-11-061-2/+2
| * | Bump apache-mod_security-dev package versiondoktornotor2015-11-061-2/+2
| * | Bump apache-mod_security-dev package versiondoktornotor2015-11-061-1/+1
| * | XMLRPC sync fixes and improvementsdoktornotor2015-11-061-54/+91
| * | XMLRPC sync fixes and improvementsdoktornotor2015-11-061-83/+93
* | | Merge pull request #1138 from doktornotor/patch-5Renato Botelho2015-11-063-6/+6
|\ \ \
| * | | Bump haproxy-legacy package versiondoktornotor2015-11-061-1/+1
| * | | Bump haproxy-legacy package versiondoktornotor2015-11-061-2/+2
| * | | Bump haproxy-legacy package versiondoktornotor2015-11-061-1/+1
| * | | Fix XMLRPC sync with CARP/HAdoktornotor2015-11-061-2/+2
| |/ /
* | | Merge pull request #1137 from doktornotor/patch-4Renato Botelho2015-11-065-107/+188
|\ \ \
| * | | Bump filer package versiondoktornotor2015-11-061-1/+1
| * | | Bump filer package versiondoktornotor2015-11-061-1/+1
| * | | Bump filer package versiondoktornotor2015-11-061-1/+1
| * | | XMLRPC sync fixes and improvementsdoktornotor2015-11-061-33/+79