Merging master, fixing conflicts

This commit is contained in:
DanB
2016-01-06 14:52:29 +01:00
26 changed files with 618 additions and 88 deletions

View File

@@ -265,6 +265,9 @@ func TestRSRFilterPass(t *testing.T) {
if fltr.Pass("full_match1") {
t.Error("Passing!")
}
if fltr.Pass("") {
t.Error("Passing!")
}
fltr, err = NewRSRFilter("^prefixMatch") // Prefix pass
if err != nil {
t.Error(err)