tree 2038cc62626a5b8f0cd7c226e5330f4aa0a2cf41
parent 83f66cd2a0c64b81016e635ac24a4ec586885a58
parent 8f01b1d2352aad5e0e51600c31653dbbd7807905
author Ales Komarek <akomarek@mirantis.com> 1497266198 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1497266199 +0000

Merge "set start and stop timeout in etcd service"