summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #299 from AlexanderS/fix/cachingChris St. Pierre2015-10-0511-32/+99
|\
| * doc: Fix docs about cachingAlexander Sulfrian2015-07-271-4/+6
| * Properties: Expire the metadata cache during reload of the filesAlexander Sulfrian2015-07-272-14/+42
| * Probes: Use core.metadata_cache instead of Bcfg2.Server.CacheAlexander Sulfrian2015-07-271-7/+8
| * AWSTags: Expire metadata cache at start of client runAlexander Sulfrian2015-07-271-0/+5
| * PuppetENC: Fix cache expirationAlexander Sulfrian2015-07-271-1/+1
| * GroupLogic: Expire metadata cache on config file changesAlexander Sulfrian2015-07-271-1/+12
| * SSHbase: Expire metadata cache on pubkey eventAlexander Sulfrian2015-07-271-0/+4
| * Ohai: Expire metadata cache, if ohai data changesAlexander Sulfrian2015-07-271-1/+6
| * TemplateHelper: Expire metadata cache on FileMonitor eventAlexander Sulfrian2015-07-272-4/+15
* | Merge branch 'fix/django1.7' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-10-0130-2150/+2977
|\ \
| * | Reports: Use try/except and no version comparisonAlexander Sulfrian2015-09-291-3/+2
| * | tools/upgrade: Fix checking for related fieldsAlexander Sulfrian2015-09-291-7/+9
| * | Reporting: Add django.setup()Alexander Sulfrian2015-09-291-0/+3
| * | Reporting: Replace get_template_from_string() for django 1.8Alexander Sulfrian2015-09-231-2/+9
| * | DBSettings: XViewMiddleware was moved into another packageAlexander Sulfrian2015-09-231-2/+8
| * | Reporting: Replace _meta.get_all_field_names() for django 1.8Alexander Sulfrian2015-09-231-1/+11
| * | Reports: Add explicit default valueAlexander Sulfrian2015-09-231-1/+1
| * | Reports: Fix InternalDatabaseVersionAlexander Sulfrian2015-09-232-14/+23
| * | DBSettings: allow_syncdb is replaced with allow_migrateAlexander Sulfrian2015-09-231-1/+8
| * | Reporting: Do not use django.db.backend in newer django versionsAlexander Sulfrian2015-09-232-12/+22
| * | tools/upgrade: Support multiple databasesAlexander Sulfrian2015-09-231-3/+5
| * | tools/upgrade: Parse the Options before using djangoAlexander Sulfrian2015-09-231-2/+3
| * | Replace close_connection() for newer django versionsAlexander Sulfrian2015-09-232-4/+13
| * | Server: Use close_db_connection decorator everywhereAlexander Sulfrian2015-09-231-4/+1
| * | Server/Admin: Remove load_models() callAlexander Sulfrian2015-09-231-1/+0
| * | Server/Admin: Remove call of django.setupAlexander Sulfrian2015-09-231-3/+0
| * | DBSettings: syncdb is replaced by migrateAlexander Sulfrian2015-09-231-2/+4
| * | DBSettings: Automatically upgrade migrations from south to djangoAlexander Sulfrian2015-09-231-0/+43
| * | Add matching django migrations for southAlexander Sulfrian2015-09-237-272/+411
| * | Reporting: Clear error message if django is missingAlexander Sulfrian2015-09-231-8/+7
| * | fix check for reporting in src/lib/Bcfg2/Server/Plugins/Reporting.pyJonas Jochmaring2015-09-231-7/+11
| * | added django.setup() calls to src/lib/Bcfg2/DBSettings.pyJonas Jochmaring2015-09-232-2/+6
| * | update testsuite for django 1.7Jonas Jochmaring2015-09-231-0/+4
| * | some more django 1.7 compatibility fixesJonas Jochmaring2015-09-233-14/+19
| * | make Bcfg2-web compatible with django 1.7Jonas Jochmaring2015-09-2313-492/+1061
* | | Merge branch 'add-schemamigration' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-10-011-1/+13
|\ \ \
| * | | bcfg2-admin: Add command to generate migrationsAlexander Sulfrian2015-09-211-1/+13
* | | | Merge branch 'master' of https://github.com/kincl/bcfg2Sol Jerome2015-10-011-0/+1
|\ \ \ \
| * | | | Run the superclass shutdown() to correctly set self.startedJason Kincl2015-09-291-0/+1
* | | | | testsuite: metadata.bundles shoud be a set()Alexander Sulfrian2015-09-301-2/+2
* | | | | Bundler: Fix addition of bundle.Alexander Sulfrian2015-09-301-1/+1
|/ / / /
* | | | Merge branch 'master' of https://github.com/gordonmessmer/bcfg2Sol Jerome2015-09-241-3/+10
|\ \ \ \
| * | | | The export script will set _rc to "rc<number", and likewise forGordon Messmer2015-09-141-3/+3
| * | | | Include recent changes in RPM spec dependencies.Gordon Messmer2015-09-131-2/+9
* | | | | Merge branch 'core-py' of https://github.com/gordonmessmer/bcfg2Sol Jerome2015-09-241-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Prevent lxml Element from being passed non-string dataGordon Messmer2015-09-131-1/+1
| |/ / /
* | | | Merge pull request #310 from AlexanderS/fix/loggingChris St. Pierre2015-09-211-0/+2
|\ \ \ \
| * | | | Logging: Fix message buildingAlexander Sulfrian2015-09-211-0/+2
|/ / / /
* | | | Merge pull request #306 from gordonmessmer/masterChris St. Pierre2015-09-111-1/+9
|\| | |