diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-05 07:06:29 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-05 07:06:29 -0600 |
commit | 4dcd236efc95718475615da9d054e3e3ed7f128c (patch) | |
tree | 7f6f22a0717ee322a528122d274a4d74af12882e /src/lib/Bcfg2/Server/Plugins/Metadata.py | |
parent | f5c2e1f64b90b59716c835c10b0ffef510eb33df (diff) | |
download | bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.tar.gz bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.tar.bz2 bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.zip |
Svn: fixed conflict resolution callback, log level
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Metadata.py')
0 files changed, 0 insertions, 0 deletions