Merge branch 'master' of https://github.com/naparuba/shinken

shinken-solutions · Jan 29, 2015 · 8dc71bf · 8dc71bf
2 parents 3ab4114 + a9b22b1
commit 8dc71bf
Show file tree

Hide file tree

Showing 47 changed files with 1,277 additions and 2,029 deletions.
diff --git a/contrib/bin/shinken-admin b/contrib/bin/shinken-admin
@@ -42,7 +42,7 @@ try:
     import shinken.pyro_wrapper as pyro
 except ImportError:
     sys.exit("Shinken require the Python Pyro module. Please install it.")
-from shinken.arbiterlink import ArbiterLink
+from shinken.objects.arbiterlink import ArbiterLink
 Pyro = pyro.Pyro
 
 
@@ -223,12 +223,12 @@ class ShinkenAdmin(cmd.Cmd):
         '''
         from shinken.objects.config import Config
 
-        from shinken.arbiterlink import ArbiterLink
-        from shinken.schedulerlink import SchedulerLink
-        from shinken.pollerlink import PollerLink
-        from shinken.reactionnerlink import ReactionnerLink
-        from shinken.brokerlink import BrokerLink
-        from shinken.receiverlink import ReceiverLink
+        from shinken.objects.arbiterlink import ArbiterLink
+        from shinken.objects.schedulerlink import SchedulerLink
+        from shinken.objects.pollerlink import PollerLink
+        from shinken.objects.reactionnerlink import ReactionnerLink
+        from shinken.objects.brokerlink import BrokerLink
+        from shinken.objects.receiverlink import ReceiverLink
 
 
         if line == "help" or line == "":

diff --git a/doc/source/01_about/about.rst b/doc/source/01_about/about.rst
diff --git a/doc/source/01_about/features-and-release-cycle.rst b/doc/source/01_about/features-and-release-cycle.rst
diff --git a/doc/source/01_about/shinken-innovative-features.rst b/doc/source/01_about/shinken-innovative-features.rst
diff --git a/doc/source/01_about/the-project-vision.rst b/doc/source/01_about/the-project-vision.rst