From cdc2392b3cb69259548c125bd13ef16f3f9dbc42 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 8 Nov 2012 11:16:36 +0100
Subject: [PATCH] Rename Confd.hs to Confd/Types.hs
This should be the last module rename, promise!
We rename this to conform to the other hierarchies (e.g. Query), and
to not have both Confd.hs and Confd/*.hs.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
Makefile.am | 2 +-
htest/Test/Ganeti/Confd/Utils.hs | 2 +-
htools/Ganeti/Confd/Server.hs | 2 +-
htools/Ganeti/{Confd.hs => Confd/Types.hs} | 2 +-
htools/Ganeti/Confd/Utils.hs | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename htools/Ganeti/{Confd.hs => Confd/Types.hs} (99%)
diff --git a/Makefile.am b/Makefile.am
index d3103abe5..d6bf864b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -422,8 +422,8 @@ HS_LIB_SRCS = \
htools/Ganeti/BasicTypes.hs \
htools/Ganeti/Common.hs \
htools/Ganeti/Compat.hs \
- htools/Ganeti/Confd.hs \
htools/Ganeti/Confd/Server.hs \
+ htools/Ganeti/Confd/Types.hs \
htools/Ganeti/Confd/Utils.hs \
htools/Ganeti/Config.hs \
htools/Ganeti/Daemon.hs \
diff --git a/htest/Test/Ganeti/Confd/Utils.hs b/htest/Test/Ganeti/Confd/Utils.hs
index f596ae3cf..e279e2d22 100644
--- a/htest/Test/Ganeti/Confd/Utils.hs
+++ b/htest/Test/Ganeti/Confd/Utils.hs
@@ -36,7 +36,7 @@ import Test.Ganeti.TestHelper
import Test.Ganeti.TestCommon
import qualified Ganeti.BasicTypes as BasicTypes
-import qualified Ganeti.Confd as Confd
+import qualified Ganeti.Confd.Types as Confd
import qualified Ganeti.Confd.Utils as Confd.Utils
import qualified Ganeti.Constants as C
import qualified Ganeti.Hash as Hash
diff --git a/htools/Ganeti/Confd/Server.hs b/htools/Ganeti/Confd/Server.hs
index 2e9b4db70..35aab41b8 100644
--- a/htools/Ganeti/Confd/Server.hs
+++ b/htools/Ganeti/Confd/Server.hs
@@ -50,7 +50,7 @@ import Ganeti.Errors
import Ganeti.Daemon
import Ganeti.JSON
import Ganeti.Objects
-import Ganeti.Confd
+import Ganeti.Confd.Types
import Ganeti.Confd.Utils
import Ganeti.Config
import Ganeti.Hash
diff --git a/htools/Ganeti/Confd.hs b/htools/Ganeti/Confd/Types.hs
similarity index 99%
rename from htools/Ganeti/Confd.hs
rename to htools/Ganeti/Confd/Types.hs
index 6746f8690..4ac4eaead 100644
--- a/htools/Ganeti/Confd.hs
+++ b/htools/Ganeti/Confd/Types.hs
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
-module Ganeti.Confd
+module Ganeti.Confd.Types
( C.confdProtocolVersion
, C.confdMaxClockSkew
, C.confdConfigReloadTimeout
diff --git a/htools/Ganeti/Confd/Utils.hs b/htools/Ganeti/Confd/Utils.hs
index 01c7ee714..f79e6e8b6 100644
--- a/htools/Ganeti/Confd/Utils.hs
+++ b/htools/Ganeti/Confd/Utils.hs
@@ -37,7 +37,7 @@ import qualified Data.ByteString as B
import qualified Text.JSON as J
import Ganeti.BasicTypes
-import Ganeti.Confd
+import Ganeti.Confd.Types
import Ganeti.Hash
import qualified Ganeti.Constants as C
import qualified Ganeti.Path as Path
--
GitLab