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)
commit94d7e6646a28ccad080afece9952df5384b894eb
treef657d55bc8df7994568c48bf65e8defc021d738c
parenta690f9b3faac1f44ca0d034bccb8dffe0e4c308a
parent054874ab749ef8b37130aff9e103e054ca2b39f6
Merge "Increase timeout in config pusher for conflicting version ex"