From 6476f7c7b43a2818fdd23ee8ee1f5a7567c4d778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Aug 2016 16:02:14 +0200 Subject: [PATCH 1/2] Adjustments for running the new unified pillar --- cloud.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud.py b/cloud.py index 39b3ab9..18722db 100755 --- a/cloud.py +++ b/cloud.py @@ -1,9 +1,9 @@ #!/usr/bin/env python -from pillar_server import PillarServer +from pillar import PillarServer app = PillarServer('.') app.process_extensions() if __name__ == '__main__': - app.run('::0', 5000, debug=True) + app.run('::0', 5001, debug=True) From 7900dbbff5e6d948f26270565534a7ea71ce833b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 5 Aug 2016 18:20:34 +0200 Subject: [PATCH 2/2] New package name for fused pillar --- cloud-manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-manage.py b/cloud-manage.py index 02324ad..ece6bab 100755 --- a/cloud-manage.py +++ b/cloud-manage.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from pillar_server import cli +from pillar import cli from cloud import app cli.manager.app = app