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>

diff --git a/Makefile.am b/Makefile.am
index d3103ab..d6bf864 100644 (file)
--- 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 f596ae3..e279e2d 100644 (file)
--- 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 2e9b4db..35aab41 100644 (file)
--- 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 6746f86..4ac4eae 100644 (file)
--- 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 01c7ee7..f79e6e8 100644 (file)
--- 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