From 0727af9e3db5bcae5dcd11603d5763edd307afaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20BERSAC?= <etienne.bersac@people-doc.com>
Date: Thu, 20 Aug 2015 16:35:39 +0200
Subject: [PATCH] Defaults to current saltenv in state.sls

---
 salt/modules/state.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/salt/modules/state.py b/salt/modules/state.py
index f9194743ee..73b3fd5fb7 100644
--- a/salt/modules/state.py
+++ b/salt/modules/state.py
@@ -354,7 +354,7 @@ def highstate(test=None,
 
 
 def sls(mods,
-        saltenv='base',
+        saltenv=None,
         test=None,
         exclude=None,
         queue=False,
@@ -411,6 +411,9 @@ def sls(mods,
         # Backwards compatibility
         saltenv = env
 
+    if saltenv is None:
+        saltenv = __opts__['environment'] or 'base'
+
     if queue:
         _wait(kwargs.get('__pub_jid'))
     else: