Thomas S Hatch
5bc5f965ba
Merge pull request #18155 from thatch45/raet_runner_event
...
Fix runners on raet
2014-11-17 17:13:53 -07:00
rallytime
ab3dfdea8c
Wrap map function in a list so file.append will work
2014-11-17 17:08:13 -07:00
Thomas S Hatch
0699983020
Merge pull request #18128 from Achimh3011/fix-zypper
...
Fix zypper
2014-11-17 17:07:32 -07:00
Thomas S Hatch
eeafcd4d05
Merge pull request #18127 from viktortnk/docker-cpu-params
...
Added docker cpu params
2014-11-17 17:06:38 -07:00
Thomas S Hatch
3abdc106a4
Merge pull request #18126 from klyr/docker_insecure_registry
...
Docker insecure registry
2014-11-17 17:05:48 -07:00
Justin Findlay
e16da094d1
update timezone.py shell cmds
2014-11-17 16:58:10 -07:00
Thomas S Hatch
22335c2f6c
Merge pull request #18119 from kshenk1/cloud_wait_for_volume
...
Adds param to def create_attach_volume (wait_to_finish), default to true...
2014-11-17 16:41:13 -07:00
Thomas S Hatch
9d7517c791
Merge pull request #18166 from thatch45/nmadhok-daemons/flo-python3-core
...
Merge #18010
2014-11-17 16:38:12 -07:00
Thomas S Hatch
4c3204cff5
modernize took out the next and the name
2014-11-17 16:37:07 -07:00
Thomas S Hatch
3f0ebfc3eb
Merge branch 'daemons/flo-python3-core' of https://github.com/nmadhok/salt into nmadhok-daemons/flo-python3-core
2014-11-17 16:35:39 -07:00
Samuel M Smith
abbf24803c
Merge remote-tracking branch 'upstream/develop' into sam_call2
2014-11-17 16:28:40 -07:00
Thomas S Hatch
b39106752b
Merge pull request #17805 from nmadhok/pillar-python3-mysql
...
Making salt.pillar.mysql python3 compatible
2014-11-17 16:27:59 -07:00
Justin Findlay
c384dfa36f
handle missed cmd.retcode statement
2014-11-17 16:27:58 -07:00
Samuel M Smith
323ed767a7
Added routing logic for 'fun' on master and syndic
2014-11-17 16:27:55 -07:00
Thomas S Hatch
d8bf960a99
Merge pull request #17284 from smoothify/develop
...
Read Pillar files into OrderedDict to preserve source order
2014-11-17 16:26:23 -07:00
Thomas S Hatch
6fae7603ba
Merge pull request #16963 from dmyerscough/sudo-recommendation
...
client_acl with sudo
2014-11-17 16:25:41 -07:00
Mike Place
264b977a58
pass shell arg
2014-11-17 16:15:34 -07:00
Justin Findlay
9c19014af7
quotify yumpkg.py
2014-11-17 16:15:30 -07:00
Mike Place
cfce29a678
Set shell on keyboard module calls
2014-11-17 15:53:54 -07:00
Mike Place
0104abc5db
Merge pull request #18159 from jacksontj/2014.7
...
Change log line to trace
2014-11-17 15:49:22 -07:00
Mike Place
f49e20510f
Use re to search for jails/services
2014-11-17 15:48:06 -07:00
Samuel M Smith
5d96c80b9e
Fix final return bug where worker sends return to minion but minion lane has been reaped. Now worker inhibits and
...
does not send it.
2014-11-17 15:46:34 -07:00
Damian Myerscough
3ed419288a
sudo_client acl directive
2014-11-17 14:13:06 -08:00
Thomas Jackson
f8c9508d89
Change log line to trace
2014-11-17 14:11:32 -08:00
Justin Findlay
3acd6f708d
quotify zfs
2014-11-17 15:02:26 -07:00
Damian Myerscough
d8037a7a05
Allow users to set sudo_acl via config in order to force sudo in acl group
2014-11-17 14:00:14 -08:00
Damian Myerscough
40e3f66151
Merge branch 'develop' of https://github.com/saltstack/salt into sudo-recommendation
2014-11-17 13:56:05 -08:00
Colton Myers
6b85155a6d
Merge pull request #18157 from basepi/client_acl_docs
...
Add one additional folder and clarification to client_acl docs
2014-11-17 14:55:46 -07:00
Colton Myers
b2a2facb27
Add one additional folder and clarification to client_acl docs
2014-11-17 14:55:08 -07:00
Damian Myerscough
ed422d6300
Merge branch 'develop' into sudo-recommendation
2014-11-17 13:52:50 -08:00
Thomas S Hatch
4a05de29ec
change runner event instansiation to use factory func
2014-11-17 14:38:52 -07:00
Thomas S Hatch
43f4b8af4f
Add get_runner_event
2014-11-17 14:37:16 -07:00
Thomas S Hatch
1697094b0b
Add RunnerEvent to rat
2014-11-17 14:31:18 -07:00
Mike Place
c51b96f2d4
quote debian_ip
2014-11-17 14:31:06 -07:00
Justin Findlay
eca1250fdb
python_shell=True and shlex quotes
2014-11-17 14:03:54 -07:00
Warren Turkal
dde993e14d
Fix an exception in s3fs.
...
S3fs was throwing an exception during the sync in the case where a file
requested does not exist in s3. This commit does the mimimum possible
to fix this issue.
2014-11-17 12:54:29 -08:00
Mike Place
246434ec86
Use file.append to write
2014-11-17 13:45:27 -07:00
Mike Place
f68a16310e
quote bsd_shadow
2014-11-17 13:32:20 -07:00
rallytime
e2c5ae3390
Add six dep notice to building docs instructions in documentation doc
2014-11-17 13:18:38 -07:00
Achim Herwig
239a317cc0
Rename argument as proposed by terminalmage.
2014-11-17 21:18:24 +01:00
rallytime
4660a04d30
Add six dep to build the docs in hacking doc
2014-11-17 13:17:37 -07:00
Mike Place
9671430009
Quote for bluez
2014-11-17 13:16:03 -07:00
Mike Place
7cc16c965a
Quotes for at mod
2014-11-17 12:09:57 -07:00
Erik Kristensen
261ab7f821
fixing docker.absent, docs says it will stop and destroy, when in fact it only stops
2014-11-17 11:37:56 -07:00
Thomas S Hatch
f3fdb175c4
Merge pull request #18141 from jacksontj/saltnado
...
Move EventListener over to ZMQStreams
2014-11-17 11:02:33 -07:00
Thomas S Hatch
6eb90b7e0c
Merge pull request #18142 from s0undt3ch/hotfix/build-docs
...
Revert "Add six to list of mocked modules"
2014-11-17 10:25:59 -07:00
Thomas Jackson
1dc4b3627e
Remove unused imports
2014-11-17 09:15:49 -08:00
Pedro Algarvio
8fda8badbb
Revert "Add six to list of mocked modules"
...
This reverts commit 6ebf0fd3aa
.
We need six installed in order for the docs to build. Six is too magical
to be mocked, at last, for now.
2014-11-17 16:45:46 +00:00
Thomas Jackson
837a8ed475
Move EventListener over to ZMQStreams
2014-11-17 08:24:28 -08:00
Roman Inflianskas
284467e773
states.linux_acl: fix nonrecursive present
2014-11-17 19:08:58 +03:00