diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-10-16 11:05:37 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-10-16 11:05:37 -0700 |
| commit | c35dbe5d353c0c48c2a65ee572433eac10f8060f (patch) | |
| tree | cc51f1d9d2d3986491547cb33513c0aef014899b /.merge-branch-exclude | |
| parent | d27fea825e6982a05f932c536c29ae483ae15575 (diff) | |
| download | vyatta-wanloadbalance-c35dbe5d353c0c48c2a65ee572433eac10f8060f.tar.gz vyatta-wanloadbalance-c35dbe5d353c0c48c2a65ee572433eac10f8060f.zip | |
Should handle all of the merge issues.
fix for bug 4675. Throttle back the initial setting of nat rules during startup of wlb.
Conflicts:
src/lbdecision.cc
Diffstat (limited to '.merge-branch-exclude')
| -rw-r--r-- | .merge-branch-exclude | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude new file mode 100644 index 0000000..7545094 --- /dev/null +++ b/.merge-branch-exclude @@ -0,0 +1,7 @@ +dea233aeaba0c952fb43c5f2380c78eb5ab39b5c +561ba38f5667555a0567634fb1579f48e890a02d +f759ad558ca04657a34ce02df51c2df87adae86f +6541bb6a056c8a7a9b06078241822a3396df23d5 +d2b49d1d24a6e70dce66b48341758d616cf8a475 +5232c652ff7a069c7436ee19bfca7c1a47c4f0be +0816d20ff3a5eb7668350332a2f68141f8934712 |