diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2012-06-10 15:03:35 -0700 |
| commit | 48056fa49608bedc4c076181478485569fec7d5f (patch) | |
| tree | 3d60586d43ec504d7018af00ba7cf1d895e3f099 /doc/sync | |
| parent | 4decf5460114e222532147ccc97fbec05bc5cccb (diff) | |
| parent | 5bbd235a4a30b26f477b73b2779619a5f20ad73b (diff) | |
| download | conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.tar.gz conntrack-tools-48056fa49608bedc4c076181478485569fec7d5f.zip | |
Merge branch 'pacifica' into oxnard
Conflicts:
.frlog
debian/changelog
Diffstat (limited to 'doc/sync')
| -rw-r--r-- | doc/sync/alarm/conntrackd.conf | 4 | ||||
| -rw-r--r-- | doc/sync/ftfw/conntrackd.conf | 4 | ||||
| -rw-r--r-- | doc/sync/notrack/conntrackd.conf | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/sync/alarm/conntrackd.conf b/doc/sync/alarm/conntrackd.conf index deed291..b9520fb 100644 --- a/doc/sync/alarm/conntrackd.conf +++ b/doc/sync/alarm/conntrackd.conf @@ -198,7 +198,9 @@ Sync { # # ExpectationSync { # ftp - # h323 + # ras + # q.931 + # h.245 # sip # } # diff --git a/doc/sync/ftfw/conntrackd.conf b/doc/sync/ftfw/conntrackd.conf index 0304f0f..53a7d0f 100644 --- a/doc/sync/ftfw/conntrackd.conf +++ b/doc/sync/ftfw/conntrackd.conf @@ -221,7 +221,9 @@ Sync { # # ExpectationSync { # ftp - # h323 + # ras + # q.931 + # h.245 # sip # } # diff --git a/doc/sync/notrack/conntrackd.conf b/doc/sync/notrack/conntrackd.conf index 34e7b32..11f022e 100644 --- a/doc/sync/notrack/conntrackd.conf +++ b/doc/sync/notrack/conntrackd.conf @@ -260,7 +260,9 @@ Sync { # # ExpectationSync { # ftp - # h323 + # ras + # q.931 + # h.245 # sip # } # |