Merge "Increase timeout in config pusher for conflicting version ex"
authorTony Tkacik <ttkacik@cisco.com>
Fri, 16 Jan 2015 12:49:55 +0000 (12:49 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 16 Jan 2015 12:49:56 +0000 (12:49 +0000)
commitcac9ff2cad44fbca82be997a90575fb306e7ba2f
tree778f39cf77c973266c272021ed3c421dec9ef170
parentf5f2db49d8c6117284ab2fd49323ddd610b35c56
parent2921bc3442538667a263d1e82c42b5341d9efc75
Merge "Increase timeout in config pusher for conflicting version ex"