commit | 554ba5431fabeb34eb3d4c0d48dd826ffdff11e5 | [log] [tgz] |
---|---|---|
author | James E. Blair <jeblair@hp.com> | Mon Nov 12 14:53:32 2012 -0800 |
committer | Jenkins <jenkins@review.openstack.org> | Mon Nov 12 22:59:24 2012 +0000 |
tree | 74ec1418510a447bb37da6cf4ef5df264e02e2b8 | |
parent | 14b5537607e9cab906c3f53522bb6b5a4655be6b [diff] |
Log merge errors (at level DEBUG). Change-Id: If1c43a2965c30e56b09a6cf85bcf8959c67d62c6 Reviewed-on: https://review.openstack.org/15927 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins