Merge branch 'master' into agent
authorLuc Yriarte <luc.yriarte@intel.com>
Tue, 14 May 2013 15:23:17 +0000 (17:23 +0200)
committerLuc Yriarte <luc.yriarte@intel.com>
Tue, 14 May 2013 15:23:17 +0000 (17:23 +0200)
1  2 
cloudeebus/cloudeebus.js
cloudeebus/cloudeebus.py
setup.py

Simple merge
Simple merge
diff --cc setup.py
+++ b/setup.py
@@@ -32,10 -32,9 +32,10 @@@ setup(name = "cloudeebus"
        license = "http://www.apache.org/licenses/LICENSE-2.0",
        scripts = ["cloudeebus/cloudeebus.py"],
        packages = ["cloudeebus"],
 -      data_files = [("cloudeebus" ,["AUTHORS", "README.md", "LICENSE"])],
 +      data_files = [("cloudeebus" ,["AUTHORS", "README.md", "LICENSE"]),
 +                               ('/etc/dbus-1/system.d/', ['org.cloudeebus.conf'])],
        platforms = ("Any"),
-       install_requires = ["setuptools", "autobahn==0.5.2"],
+       install_requires = ["setuptools", "autobahn>=0.5.8"],
        classifiers = ["License :: OSI Approved :: Apache Software License",
                  "Development Status :: 3 - Alpha",
                  "Environment :: Console",