diff options
| author | Gaurav <gaurav.sinha@vyatta.com> | 2012-03-20 18:47:33 -0700 |
|---|---|---|
| committer | Gaurav <gaurav.sinha@vyatta.com> | 2012-03-20 18:47:33 -0700 |
| commit | 7330d01fd5ac752e265cf868b3a7f9ef30af9a93 (patch) | |
| tree | f60b385fa08b035e2fa6f629c98d3f7064263e67 /.gitignore | |
| parent | 613330a8acca0535df5bc1fc839fb29ce1261272 (diff) | |
| parent | 0f71f18eaec8643d8f78b95bb1657734b3f5b368 (diff) | |
| download | vyatta-conntrack-7330d01fd5ac752e265cf868b3a7f9ef30af9a93.tar.gz vyatta-conntrack-7330d01fd5ac752e265cf868b3a7f9ef30af9a93.zip | |
Merge branch 'cttimeout_pacifica' into oxnard
Brings in the changes needed for connection tracking timeouts per connection.
Conflicts:
.frlog
debian/changelog
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions