diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2017-07-11 11:48:19 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2017-07-11 11:48:19 -0500 |
| commit | 8f8599f2513ae5ac6e7a6ba6045ebf8a6d2709f4 (patch) | |
| tree | 57d5d612a811754603f80ca6c6f7bbc21b28a383 /src | |
| parent | 8022fe1ac2d0a9a1808d6f2bf139914c9726942d (diff) | |
| parent | e817da7aad42cce9e4df53adf0fe48ba92e20e57 (diff) | |
| download | bcfg2-8f8599f2513ae5ac6e7a6ba6045ebf8a6d2709f4.tar.gz bcfg2-8f8599f2513ae5ac6e7a6ba6045ebf8a6d2709f4.tar.bz2 bcfg2-8f8599f2513ae5ac6e7a6ba6045ebf8a6d2709f4.zip | |
Merge branch 'import-models' of https://github.com/0/bcfg2 into add-missing-reporting-entries
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Reporting/Storage/DjangoORM.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py index 767fd2825..6fe69c0fa 100644 --- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py +++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py @@ -27,14 +27,14 @@ def load_django_models(): # pylint: disable=W0602 global Interaction, PackageEntry, FilePerms, PathEntry, LinkEntry, \ Group, Client, Bundle, TYPE_EXTRA, TYPE_BAD, TYPE_MODIFIED, \ - FailureEntry, Performance, BaseEntry, ServiceEntry, \ + FailureEntry, Performance, BaseEntry, ServiceEntry, ActionEntry, \ POSIXGroupEntry, POSIXUserEntry # pylint: enable=W0602 from Bcfg2.Reporting.models import \ Interaction, PackageEntry, FilePerms, PathEntry, LinkEntry, \ Group, Client, Bundle, TYPE_EXTRA, TYPE_BAD, TYPE_MODIFIED, \ - FailureEntry, Performance, BaseEntry, ServiceEntry, \ + FailureEntry, Performance, BaseEntry, ServiceEntry, ActionEntry, \ POSIXGroupEntry, POSIXUserEntry |