puppet/puppetboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'puppet-community/master' into 0.1.0

Browse Source 
Fixing merge conflicts

Conflicts:
	puppetboard/app.py
	puppetboard/forms.py
	puppetboard/templates/catalogs.html
This commit is contained in:
Corey Hammerton
2015-11-05 21:05:31 -05:00
parent 9486adbd14 6f6bd0585a
commit f2393eabe4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
puppetboard/app.py
View File

@@ -379,7 +379,7 @@ def reports(env, page):
total = get_or_abort(puppetdb._query, total = get_or_abort(puppetdb._query,
'reports', 'reports',
query='["extract", [["function", "count"]],'\ query='["extract", [["function", "count"]],'\
'["and", ["=", "environment", "{0}"], ["~", "certname", ""]]]'.format( '["and", ["=", "environment", "{0}"]]]'.format(
env)) env))
total = total[0]['count'] total = total[0]['count']
reports, reports_events = tee(reports) reports, reports_events = tee(reports)

2
requirements.txt
View File

@@ -5,5 +5,5 @@ MarkupSafe==0.19
WTForms==1.0.5 WTForms==1.0.5
Werkzeug==0.9.4 Werkzeug==0.9.4
itsdangerous==0.23 itsdangerous==0.23
pypuppetdb==0.1.1 pypuppetdb==0.2.0
requests==2.2.1 requests==2.2.1