valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,882 Commits 24 Branches 182 Tags 341 MiB
059416e75b
Commit Graph

35882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel M Smith
b5fd2ba04d Cleaned up event forwarding. No longer nests inside spurious message just forwards event msg as is 2014-09-29 16:16:48 -06:00
rallytime
38db7b7d5e Add note on how to set pillar data on the command line to pillar tutorial 
Closes #14217
 2014-09-29 16:04:30 -06:00
Thomas Jackson
b0861d16cf Start listening for returns before firing off the ping 2014-09-29 14:56:16 -07:00
Thomas Jackson
75bf64f8bd fix for #16240 
This just exposes a but in the event class where the nonblocking function doesn't check if you have subscribed yet or not
 2014-09-29 13:38:17 -07:00
Pedro Algarvio
7763c3bd53 Update 'doc/.tx/config' - Build #166 
http://cookingwithsalt.org/job/salt/job/transifex/166/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-09-29 21:34:48 +01:00
Thomas S Hatch
1da2389a89 Merge pull request #16193 from thatch45/SmithSamuelM-2014.7_sam4 
Merge #16177
 2014-09-29 14:02:48 -06:00
Mike Place
a3369d11d2 Make renderers fully aware of pillar context 2014-09-29 13:41:46 -06:00
Nicole Thomas
ffeb0358f7 Merge pull request #16231 from rallytime/bp-16144 
Backport #16144 to 2014.7
 2014-09-29 13:25:53 -06:00
Thomas S Hatch
4aed486d64 Merge pull request #16224 from thatch45/keygen_fallback 
If the minion keypair does not exist, generate it
 2014-09-29 13:20:58 -06:00
Thomas S Hatch
0cff0bdc43 Merge pull request #16226 from thatch45/2014.7 
First fix for #16106
 2014-09-29 13:02:34 -06:00
Pedro Algarvio
af2434f8de Merge pull request #16232 from terminalmage/unity-manpage 
Add unity manpage to buildpackage spec
 2014-09-29 19:40:02 +01:00
Erik Johnson
e37b337a56 Add unity manpage to buildpackage spec 
This fixes automated package builds in jenkins
 2014-09-29 13:35:50 -05:00
Samuel M Smith
2d24baec3b added comment 2014-09-29 12:30:29 -06:00
Matthew Williams
dc8619280c lxc module: don't reinvent the wheel -- use lxc-attach built-in args for env and use pipes.quote instead of manual quoting 2014-09-29 12:21:04 -06:00
Matthew Williams
9fbd4c949e avoid creating unparseable lxc config param: lxc.network.mac 2014-09-29 12:21:04 -06:00
Samuel M Smith
08ca85122c Removed debug stuff 2014-09-29 12:07:46 -06:00
Samuel M Smith
ff0677c9a4 Fixed issue where get_returns_no_block was excepting if raw was None 
Fixed issue where RAETEvent.get_event_noblock was not looking at
enclosed event in msg
 2014-09-29 12:00:52 -06:00
Thomas S Hatch
c98d0304e9 First fix for #16106 2014-09-29 11:37:03 -06:00
Bruno Binet
605e609ea7 add cluster admin support for user.absent state function 2014-09-29 19:06:31 +02:00
Bruno Binet
78c060003b add cluster admin support for user.present state function 2014-09-29 19:01:40 +02:00
Bruno Binet
ff5aaf81cf add cluster admin support for user_remove method 2014-09-29 18:54:20 +02:00
Bruno Binet
7c2397e3df add cluster admin support for user_chpass method 2014-09-29 18:50:48 +02:00
Bruno Binet
9d0f965d53 add cluster admin support for user_create method 2014-09-29 18:41:31 +02:00
Bruno Binet
99a9ea6a4c add cluster admin support for user_exists method 2014-09-29 18:38:08 +02:00
Bruno Binet
b9d92b4a59 add cluster admin support for user_list method 2014-09-29 18:37:12 +02:00
Thomas S Hatch
e33adfd2b6 If the minion keypair does not exist, generate it 
Catches a bug where salt-call doe snot gen the key
 2014-09-29 10:35:18 -06:00
Samuel M Smith
d3ed1d8cf4 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-29 10:21:26 -06:00
Samuel M Smith
5e85f28a98 Added debug statement 2014-09-29 10:20:51 -06:00
Bruno Binet
f9f8ac1b1f docfix: user_update was documented as user_create 
s/user_update/user_create/
 2014-09-29 17:49:39 +02:00
Grischa Meyer
5bd7a4083f improved compatibility with different versions of novaclient 2014-09-29 11:33:25 +10:00
Pedro Algarvio
47090b472b Merge pull request #16214 from rallytime/pylint 
Pylint fix for 2014.7 branch
 2014-09-29 00:08:51 +01:00
rallytime
9da5a370f5 Pylint fix for 2014.7 branch 2014-09-28 14:17:58 -06:00
Erik Johnson
7c081589cb Add versionadded RST directive 2014-09-28 12:45:42 -05:00
Erik Johnson
d380c88d22 Add versionadded RST directive 2014-09-28 12:45:42 -05:00
Erik Johnson
1e4f030499 Add versionadded RST directive 2014-09-28 12:45:42 -05:00
rallytime
0b99acc381 Add info about running unittests w/o integration test daemons 2014-09-28 10:52:37 -06:00
Joseph Hall
f817def57b Merge pull request #16199 from terminalmage/docs 
RST formatting fixes
 2014-09-27 05:36:36 -06:00
Erik Johnson
aaf1aa62c0 RST formatting fixes 2014-09-26 23:25:42 -05:00
Samuel Smith
662d3d50ef Merge pull request #16177 from SmithSamuelM/2014.7_sam4 
Clean up RAETChannel changes to support different usages
 2014-09-26 19:41:08 -06:00
Samuel M Smith
d34e8867b7 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-26 19:38:02 -06:00
Thomas S Hatch
2f82e80293 Merge pull request #16192 from rallytime/stock_conf 
Touch up formatting in master/minion stock conf
 2014-09-26 16:49:04 -06:00
Thomas S Hatch
48d776be48 lint 2 2014-09-26 16:08:30 -06:00
Thomas S Hatch
99988a424f Lint 1 2014-09-26 16:07:57 -06:00
Thomas S Hatch
b6f88653a9 Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4 2014-09-26 16:07:18 -06:00
rallytime
4402fd80fb Clean up formatting of minion stock conf file 2014-09-26 15:38:49 -06:00
rallytime
33369370d9 Clean up formatting of master stock conf file 2014-09-26 15:15:40 -06:00
Thomas S Hatch
34223e4aab Merge pull request #16186 from rallytime/bp-16077 
Backport #16077 to 2014.7
 2014-09-26 14:59:50 -06:00
Thomas S Hatch
5e95bf7d51 Merge pull request #16171 from thatch45/16075 
Use the config_dir to find the roster
 2014-09-26 14:57:03 -06:00
Thomas S Hatch
0168f6c5ee Merge pull request #16157 from thatch45/pillar_opts 
Deprecate pillar_opts being True warnings
 2014-09-26 14:48:56 -06:00
Thomas S Hatch
968faf1331 Merge pull request #16127 from jacksontj/timeout_fixes 
Backport of #16078
 2014-09-26 14:37:01 -06:00