valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,604 Commits 24 Branches 182 Tags 341 MiB
36017c0911
Commit Graph

42604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
36017c0911 Configuration gate 2014-11-26 15:37:01 -07:00
Thomas S Hatch
96b35c5548 Merge pull request #18521 from thatch45/gate_zmq 
gate zmq!
 2014-11-26 11:56:16 -07:00
Thomas S Hatch
7b2c620414 gate zmq! 2014-11-26 11:55:38 -07:00
Nicole Thomas
c02339fde0 Merge pull request #18497 from techhat/blockDeviceMapping 
Check for blockDeviceMapping
 2014-11-26 11:11:13 -07:00
Thomas S Hatch
2e3089410a Merge pull request #18514 from cachedout/issue_16879 
Update docs for unless
 2014-11-26 09:29:24 -07:00
Thomas S Hatch
d416b8b1b8 gix tornado merge conflict 2014-11-26 09:25:47 -07:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
 2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d Update docs for unless 
Note that unless is run for each associate state dec.
 2014-11-26 09:17:14 -07:00
Thomas S Hatch
8bd25c57ae Merge pull request #18121 from keesbos/develop 
Added special branch '_' in git_pillar to match saltenv
 2014-11-26 09:03:02 -07:00
Kees Bos
2ba5400a41 Merge branch 'develop' of github.com:keesbos/salt into develop 2014-11-26 06:20:07 +01:00
Kees Bos
3731d76e06 Renamed special branch from '_' to '__env__' 2014-11-26 05:59:03 +01:00
Kees Bos
3e4d50cea9 Added special branch '_' in git_pillar to match saltenv 2014-11-26 05:59:03 +01:00
Thomas S Hatch
1c76db6c4d Merge pull request #18499 from whiteinge/runner-sync-eventlisten 
Start listening for events when RunnerClient is instantiated
 2014-11-25 20:54:44 -07:00
Nicole Thomas
186df014ba Merge pull request #18502 from rallytime/pylint_fix 
Whitespace fix
 2014-11-25 20:52:27 -07:00
rallytime
5000a0aaed Whitespace fix 2014-11-25 20:02:23 -07:00
Mike Place
ae412db6b9 Merge pull request #18500 from s0undt3ch/develop 
Move `cleanup_runtime_config_instance` out of TestDaemon
 2014-11-25 17:44:26 -07:00
Pedro Algarvio
50c437f8c5 Use atexit for the cleanup 2014-11-26 00:41:02 +00:00
Pedro Algarvio
593544b577 Move cleanup_runtime_config_instance out of TestDaemon 2014-11-26 00:20:27 +00:00
Seth House
c03288a3c9 Start listening for events when RunnerClient is instantiated 
If we're not listening to the eventstream before starting a new job
there's a high likelyhood that we'll miss the job return event. This
change mimics the event-based runners addition slated for Boron.
 2014-11-25 16:39:47 -07:00
Mike Place
96ce064a20 Merge pull request #18496 from basepi/lithiumnotes 
Add lithium release notes stub
 2014-11-25 16:10:45 -07:00
Seth House
5c08ba4324 Merge pull request #18494 from rallytime/cleanup_doc_build 
Clean up doc build so it doesn't stacktrace
 2014-11-25 15:56:29 -07:00
Colton Myers
397d61b1fc Add lithium release notes 2014-11-25 15:25:46 -07:00
Joseph Hall
7ac67c7d7c Check for blockDeviceMapping 2014-11-25 15:23:33 -07:00
rallytime
73f3c0091d Clean up doc build so it doesn't stacktrace 
Fixes #18471

- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
 2014-11-25 15:11:15 -07:00
Thomas S Hatch
876b8ca0b1 Merge pull request #18491 from jfindlay/quote_genesis 
quote strs in genesis mod
 2014-11-25 14:50:13 -07:00
Thomas S Hatch
e7e5b98ca6 Merge pull request #18490 from basepi/sshscan-17159 
Make the salt-ssh scan roster more configurable
 2014-11-25 14:49:56 -07:00
Thomas S Hatch
965a68dc24 Merge pull request #18489 from rallytime/cleanup_tornado_tests 
Skip tornado tests if we can't import ZMQIOLoop
 2014-11-25 14:48:59 -07:00
Thomas S Hatch
cf8da708c7 Merge pull request #18488 from nmadhok/sphinx-error-fix 
Fixing sphinx errors and violations
 2014-11-25 14:48:38 -07:00
Thomas S Hatch
2e44c6b26a Merge pull request #18486 from jfindlay/quote_parted 
validate block devices in parted mod
 2014-11-25 14:48:29 -07:00
Thomas S Hatch
592a65c8f0 Merge pull request #18485 from cachedout/mysql_no_log 
Do not log
 2014-11-25 14:47:37 -07:00
Thomas S Hatch
d0b17de50e Merge pull request #18484 from garethgreenaway/scheduler_fixes 
Fixes to scheduler in 2014.7
 2014-11-25 14:46:32 -07:00
Thomas S Hatch
c2df80d205 Merge pull request #18478 from nmadhok/zpool-create-property 
Adding ability in salt.modules.zpool.create() to set zpool properties at the time of creation of pool
 2014-11-25 14:46:13 -07:00
Justin Findlay
d0d2f3fdad quote strs in genesis mod 2014-11-25 13:48:04 -07:00
rallytime
eeab98c3be Skip tornado tests if we can't import ZMQIOLoop 
Tornado tests were failing on Ubuntu 10 and 12 because they don't have
a new enough version of PyZMQ to use the ioloop.current function.
 2014-11-25 13:06:33 -07:00
Nitin Madhok
93700aa642 Fixing sphinx errors and violations 2014-11-25 15:01:30 -05:00
Justin Findlay
dfc44cce4e validate block devices in parted mod 2014-11-25 12:35:03 -07:00
Mike Place
a3ef002d2a Do not log 2014-11-25 12:32:45 -07:00
Colton Myers
eceec16aef Force timeout to float 2014-11-25 12:29:25 -07:00
Gareth J. Greenaway
ed0211bc23 Adding some fixes to the schedule when splay is specified but the seconds option is not. Also allowing splay start and end flags to be equal to lock down splay to a specific number of seconds. 2014-11-25 11:28:50 -08:00
Colton Myers
4b70226325 Fix silly typo 2014-11-25 12:22:56 -07:00
Colton Myers
c9d16e60e0 Copy pasta! 2014-11-25 12:22:07 -07:00
Colton Myers
74e1830a89 Utilize the new configuration options for ssh scan roster 2014-11-25 12:18:58 -07:00
Mike Place
01e3c8974c Merge pull request #18481 from cachedout/add_jboss_docker_docs 
Add missing CLI examples
 2014-11-25 12:18:49 -07:00
Mike Place
506229d628 Add missing CLI examples 2014-11-25 12:17:13 -07:00
Nitin Madhok
43c30aa19f Lint fix 2014-11-25 13:53:33 -05:00
Colton Myers
e2ff72825c Add ssh scan options to default master config 2014-11-25 11:52:23 -07:00
Colton Myers
2d602c214c Add salt-ssh CLI options for scan ports and timeout 2014-11-25 11:47:40 -07:00
Nitin Madhok
9fded95e3c Minor fixes 2014-11-25 13:33:46 -05:00
Nitin Madhok
65059c38e8 Making changes to docs for salt.modules.zpool.create 2014-11-25 13:08:46 -05:00
Nitin Madhok
732f8590ae Adding ability in salt.modules.zpool.create() to set zpool properties at creation time 2014-11-25 12:50:30 -05:00