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)

Trivial merge