Commit e51b0bec authored by Stratos Psomadakis's avatar Stratos Psomadakis
Browse files

Merge branch 'feature-stats' into release-0.13

parents 369bb3de 62b12b07
......@@ -60,7 +60,6 @@ INSTALL_REQUIRES = [
'gdmodule',
'py-rrdtool',
'Django>=1.2, <1.3',
'snf-common>=0.9.0',
]
setup(
......@@ -90,7 +89,6 @@ setup(
'default_settings = synnefo_stats.synnefo_settings',
'web_apps = synnefo_stats.synnefo_settings:installed_apps',
'urls = synnefo_stats.urls:urlpatterns',
'loggers = synnefo_stats.synnefo_settings:loggers'
]
}
)
# Copyright 2011-2013 GRNET S.A. All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
# conditions are met:
#
# 1. Redistributions of source code must retain the above
# copyright notice, this list of conditions and the following
# disclaimer.
#
# 2. Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials
# provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# The views and conclusions contained in the software and
# documentation are those of the authors and should not be
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
# this is a namespace package
try:
import pkg_resources
pkg_resources.declare_namespace(__name__)
except ImportError:
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)
# Copyright 2011-2012 GRNET S.A. All rights reserved.
# Copyright 2011-2013 GRNET S.A. All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
......
# Copyright 2011-2012 GRNET S.A. All rights reserved.
# Copyright 2011-2013 GRNET S.A. All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
......@@ -37,10 +37,3 @@ Django settings metadata. To be used in setup.py snf-webproject entry points.
"""
installed_apps = ['synnefo_stats']
loggers = {
'synnefo_stats': {
'handlers': ['console'],
'level': 'INFO',
},
}
# Copyright 2011-2012 GRNET S.A. All rights reserved.
# Copyright 2011-2013 GRNET S.A. All rights reserved.
#
# Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following
......@@ -35,5 +35,5 @@ from django.conf.urls.defaults import patterns
from synnefo_stats.grapher import grapher
urlpatterns = patterns('',
(r'^(?P<hostname>\S+)/(?P<graph_type>\S+)/$', grapher),
(r'^stats/(?P<hostname>\S+)/(?P<graph_type>\S+)/$', grapher),
)
# This is a comment!
0.13rc5
0.13next
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment