valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,492 Commits 24 Branches 182 Tags 341 MiB
a85838b4ff
Commit Graph

25492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
a85838b4ff Merge pull request #10188 from nshalman/smartos-cron-fix 
Fix cron state to work on SmartOS
 2014-02-04 16:16:09 -08:00
Thomas S Hatch
6d3e61552f Merge pull request #10191 from cachedout/#8087 
Optimize event timeouts
 2014-02-04 16:14:00 -08:00
Thomas S Hatch
ffcddfdf26 Merge pull request #10186 from terminalmage/docs 
Add info about root_dir and the options to which it is prepended
 2014-02-04 16:13:32 -08:00
Thomas S Hatch
b57ddf67c6 Merge pull request #10185 from s0undt3ch/develop 
Fix lint issues
 2014-02-04 16:11:31 -08:00
Thomas S Hatch
39acd91a73 Merge pull request #10182 from s0undt3ch/hotfix/kill-stalled-state-jobs 
Show and kill stalled states jobs when running the tests.
 2014-02-04 16:09:04 -08:00
Thomas S Hatch
aedcfe0c9f Merge pull request #10180 from terminalmage/yum-edgecase 
Handle yum edge case
 2014-02-04 16:07:13 -08:00
Mike Place
9e2ca7fa57 * Remove spurious comment. 2014-02-04 16:27:39 -07:00
Mike Place
90f0af03d1 Optimize event timeouts 
* Don't use int() to round down timestamps in get_cli_event_returns()
* Don't re-poll for the full timeout if we get an unresponsive minion. Refs #8087
 2014-02-04 16:22:53 -07:00
Thomas S Hatch
2a2b71d399 Merge pull request #10173 from mbirtwell/wait_for_explicit_minions_in_gather_job_info_develop 
Wait for explicit minions in gather job info develop
 2014-02-04 15:20:36 -08:00
Thomas S Hatch
6513259e65 Merge pull request #10179 from saltstack/proxy_20140204 
Proxy 20140204, fix conflicts and rebase.
 2014-02-04 14:57:27 -08:00
Thomas S Hatch
dad21ded11 Merge pull request #10176 from cachedout/refix-postgres-tests 
Refix postgres tests
 2014-02-04 14:56:46 -08:00
Pedro Algarvio
74376c40ef Include what happened in the returned list. 2014-02-04 22:49:13 +00:00
Pedro Algarvio
6045f0901f Try to match some more stalled functions. 2014-02-04 22:36:39 +00:00
Erik Johnson
617c04c6ac Rename apt to aptpkg in sphinx configuration 2014-02-04 16:26:13 -06:00
Joseph Hall
77bece6423 Merge pull request #10184 from gtmanfred/develop 
[salt-cloud] rackconnect and managedcloud fix
 2014-02-04 14:07:30 -08:00
Nahum Shalman
b1e81a5ebb Fix cron state to work on SmartOS 
SmartOS and Solaris are both in the Solaris os_family
If we use that grain, the module should work on SmartOS
 2014-02-04 17:00:18 -05:00
Erik Johnson
ffd189cc7b Add info about root_dir and the options to which it is prepended 2014-02-04 15:46:22 -06:00
Daniel Wallace
81ce24888e [Salt-cloud] use list_nodes_full for extra dict 
Rackconnect and ManagedCloud require the extra dict in the node data.  I
have also added the default options for those because the values are
not set immediately.
 2014-02-04 15:37:23 -06:00
Daniel Wallace
fefa6203f7 [Salt-cloud] Add function for checking libcloud versions. 
Everything else should need 0.13.2, but rackconnect will need 0.14.0.
Add a function to make custom requirements for libcloud as you would
need them.
 2014-02-04 15:37:18 -06:00
Pedro Algarvio
bec3c422a8 Don't complain about Crypto.Signature PyLint! 2014-02-04 21:34:39 +00:00
Pedro Algarvio
83f128eb42 Include the coding header 2014-02-04 21:31:24 +00:00
Pedro Algarvio
6248850055 Show and kill stalled states jobs when running the tests. 2014-02-04 21:07:13 +00:00
Erik Johnson
9a67246d79 Handle yum edge case 
Handle edge case where there are extra lines in the repoquery output.
 2014-02-04 14:08:30 -06:00
C. R. Oldham
f09690907b Fix release notes. 2014-02-04 12:27:00 -07:00
C. R. Oldham
83672380d6 Changes to the proxy minion, add release notes, remove REST server (move to separate repo) 2014-02-04 12:19:13 -07:00
Joseph Hall
6413573dc5 Merge pull request #10177 from whiteinge/remove-saltconf-banner 
Remove saltconf banner
 2014-02-04 11:01:20 -08:00
C. R. Oldham
8d1e170926 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-02-04 12:00:50 -07:00
Seth House
7d1b4c2312 Revert "Added SaltConf banner to main docs page" 
This reverts commit 9834a9afda.

Conflicts:
	doc/_static/saltconf.jpg
	doc/index.rst
 2014-02-04 11:43:41 -07:00
Seth
475f165bf7 Revert "Added Saltconf banner to docs sidebar" 
This reverts commit 70be208bc5.

Conflicts:
	doc/_themes/saltstack/layout.html
 2014-02-04 11:40:20 -07:00
Thomas S Hatch
5ebb23ce73 No mutable default args. @ranl per #10167 2014-02-04 11:35:13 -07:00
John Anderson
e1fa6955ff Tighten up regex a bit 2014-02-04 11:34:18 -07:00
Thomas S Hatch
db4c70707a Merge pull request #10167 from ranl/modjk_state 
Modjk state
 2014-02-04 10:33:25 -08:00
Thomas S Hatch
2c40c443d0 Lint fixes 2014-02-04 11:32:54 -07:00
C. R. Oldham
caa27a1c00 Merge pull request #10174 from saltstack/release_notes 
Add proxy minion release notes
 2014-02-04 10:24:47 -08:00
C. R. Oldham
42b4c27813 Add proxy minion release notes 2014-02-04 11:23:26 -07:00
Thomas S Hatch
6f15bb2875 Merge pull request #10170 from krazybean/develop 
added show global/variables
 2014-02-04 10:19:33 -08:00
Thomas S Hatch
5f3a543732 Merge pull request #10165 from joehealy/rename_js_file 
Rename js file to make minified file relationship clear
 2014-02-04 10:18:05 -08:00
Thomas S Hatch
0756706fa2 Merge pull request #10146 from ticosax/trigger-update-of-states 
Improve detection of changes when pull or build an image
 2014-02-04 10:17:25 -08:00
Thomas S Hatch
dc3bc6e399 Merge pull request #10093 from zmcneilly/fix-solaris-fcntl 
fcntl incompatibility when using SunOS/SmartOS as a host
 2014-02-04 10:16:21 -08:00
Thomas S Hatch
98b3569dd3 Merge pull request #10161 from tedski/10107 
Automatically resolve dependencies when sourcing a deb file.
 2014-02-04 10:13:58 -08:00
Mike Place
8a0167e72b Loosen regex to allow for quoting quirk on Ubuntu 10.x 2014-02-04 18:00:48 +00:00
Michael Birtwell
a1df2ac737 Less hacky? way of passing known minions around 
Gets of the known_minions arg on cmd to have gather_job_info do more
work
 2014-02-04 17:47:43 +00:00
Michael Birtwell
337a88c84f Wait for explicit minions in gather job info 
Improves syndic case because gather job info doesn't exit quickly
thinking it's found all minions before syndic has responded
 2014-02-04 17:47:43 +00:00
Michael Birtwell
812834d11b Logging 2014-02-04 17:47:43 +00:00
Pedro Algarvio
0081fa57f2 Merge pull request #10172 from s0undt3ch/develop 
Include new docs to translate
 2014-02-04 09:45:07 -08:00
Pedro Algarvio
65310253e3 Include new docs to translate 2014-02-04 17:42:40 +00:00
Pedro Algarvio
6bd13e5ddb Merge pull request #10171 from s0undt3ch/develop 
More doc translations stuff
 2014-02-04 09:31:47 -08:00
Zach McNeilly
bed877f8bd According to the SunOS man page on flock: 
flock() applies or removes an advisory lock on the file associ-
     ated with the file descriptor fd. The compatibility version of
     flock() has been implemented on top of fcntl(2) locking.  It does
     not provide complete binary compatibility

This lack of binary compatibility results in some odd behavior when
running salt-master on a SunOS/SmartOS host. Specifically an IOError
[Errno 9] is thrown whenever the master calls the file_hash method.

Specifically it has to do with the fact that on SunOS/SmartOS the lock
is released when the file is closed,  whereas in Linux the lock is kept
until it is released. An article discussing the problem in detail can be
found here:

http://infinitesque.net/articles/2010/on%20Python%20flock/index.html

To get this working I changed salt/fileserver/roots.py to check os.uname()
to make sure it's not a SunOS host when setting HAS_FCNTL. Comments indicate
Windows shouldn't have this set either.
 2014-02-04 16:59:52 +00:00
Pedro Algarvio
da36713cd2 Use sys.stdout.write() instead of print(). 2014-02-04 16:07:03 +00:00
Pedro Algarvio
23c551efe3 Remove deleted resources. 2014-02-04 16:06:21 +00:00