From 3734f1440ee45f7b2bc478caffc54d5e8ddd2ccb Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 27 Feb 2013 12:29:13 +0000
Subject: [PATCH] Update `cli` to use the new `MergeConfigMixIn`.

The purpose of the above MixIn is to override the options on the configuration file with the options passed from the console.
---
 saltapi/cli.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/saltapi/cli.py b/saltapi/cli.py
index 465591a639..58b54bac8b 100644
--- a/saltapi/cli.py
+++ b/saltapi/cli.py
@@ -3,20 +3,22 @@ CLI entry-point for salt-api
 '''
 # Import salt libs
 from salt.utils.parsers import (
-        ConfigDirMixIn,
-        DaemonMixIn,
-        LogLevelMixIn,
-        OptionParser,
-        OptionParserMeta,
-        PidfileMixin)
+    ConfigDirMixIn,
+    DaemonMixIn,
+    LogLevelMixIn,
+    MergeConfigMixIn,
+    OptionParser,
+    OptionParserMeta,
+    PidfileMixin)
 
 # Import salt-api libs
 import saltapi.client
 import saltapi.config
 import saltapi.version
 
+
 class SaltAPI(OptionParser, ConfigDirMixIn, LogLevelMixIn, PidfileMixin,
-        DaemonMixIn):
+              DaemonMixIn, MergeConfigMixIn):
     '''
     The cli parser object used to fire up the salt api system.
     '''