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
36,886 Commits 24 Branches 182 Tags 341 MiB
9466dba1ce
Commit Graph

36886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
6679f26736 Remove unused kwarg from _check_state_return 2014-09-11 23:32:51 -06:00
Thomas S Hatch
cd7c31df7f Merge pull request #15691 from mickep76/develop 
Added reference to Pepa doc. and in-line rst documentation
 2014-09-11 23:12:55 -06:00
Thomas S Hatch
6e38d6f9f1 Merge pull request #15683 from SEJeff/fix-network-managed-state-rhel7 
Add the ifcfg-* template for 'network.managed' to work on RHEL7
 2014-09-11 23:06:42 -06:00
Thomas S Hatch
cc8d5af514 Merge pull request #15682 from nmadhok/fix-state-archive-example 
Correcting example in salt.states.archive.extracted and specifying tar_options
 2014-09-11 23:05:55 -06:00
Thomas S Hatch
faf765ee84 Merge pull request #15670 from eliasp/2014.7-salt.states.dockerio-proper-error-output 
states.dockerio: Show the error instead of the container name again.
 2014-09-11 23:02:37 -06:00
Thomas S Hatch
213db608c0 Merge pull request #15666 from rbjorklin/fixed-tomcat.fullversion 
Fixed tomcat.fullversion on Ubuntu in salt/modules/tomcat.py, issue 13456
 2014-09-11 22:59:10 -06:00
Thomas S Hatch
14677122d7 Merge pull request #15667 from cachedout/issue_13146 
Fix auto-order problem in state.template
 2014-09-11 22:56:18 -06:00
Thomas S Hatch
5042a50c40 Merge pull request #15629 from cachedout/issue_15608 
Pass user info with the syndic
 2014-09-11 22:36:46 -06:00
Mike Place
ea2fc03cf0 Add another doc string 2014-09-11 22:35:05 -06:00
Pedro Algarvio
e7a59ab559 Merge pull request #15725 from terminalmage/re-enable-tests 
Revert "Revert "Re-enable test run SLS""
 2014-09-12 05:22:46 +01:00
Mike Place
88fbe4eba0 Starting on function docs for key.py 2014-09-11 22:22:19 -06:00
Erik Johnson
c69d47d062 Revert "Revert "Re-enable test run SLS"" 
This reverts commit fcfa1a244e and
re-enables tests in jenkins.py. They had been left commented out while I
was testing.
 2014-09-11 18:08:29 -05:00
Thomas S Hatch
ad2e3bde7a Merge pull request #15703 from loz-hurst/patch-2 
Fix broken back ticks in 68301c4
 2014-09-11 16:51:11 -06:00
Thomas S Hatch
18193d65fd Merge pull request #15711 from hulu/lxc-typos 
fix typos in lxc execution module
 2014-09-11 16:50:35 -06:00
Thomas S Hatch
41f83067d6 Merge pull request #15714 from cachedout/crypt_doc 
Some docstrings
 2014-09-11 16:50:11 -06:00
Thomas S Hatch
877c8cc43a Merge pull request #15717 from thatch45/ssh_backends 
don't default to all backends, that is crazy, just the listed ones
 2014-09-11 16:49:46 -06:00
Thomas S Hatch
f4209ac2d0 Merge pull request #15687 from thatch45/ssh_error_report 
Report error information when ssh fails
 2014-09-11 16:49:23 -06:00
Thomas S Hatch
30d591e0f2 Merge pull request #15685 from thatch45/funcs_only_in_data 
Only load funcs if we need to
 2014-09-11 16:49:14 -06:00
Thomas S Hatch
16939408f8 Merge pull request #15679 from thatch45/ssh_static 
Add --static to salt-ssh
 2014-09-11 16:48:49 -06:00
Thomas S Hatch
6edfc3d281 Merge pull request #15558 from terminalmage/buildpackage 
Add automated RPM building to jenkins tests
 2014-09-11 16:44:27 -06:00
Erik Johnson
fcfa1a244e Revert "Re-enable test run SLS" 
This reverts commit 8bcc418aa2.
 2014-09-11 17:44:00 -05:00
Erik Johnson
8883f974a8 Add command-line options for package build options 
Also add these to pillar data so they make it to the buildpackage SLS
 2014-09-11 17:05:09 -05:00
Pedro Algarvio
781092daaa Merge branch '2014.7' into develop 2014-09-11 22:42:04 +01:00
Thomas S Hatch
868e24590a don't default to all backends, that is crazy, just the listed ones 
This also adapts the backends to accept a comma seperated list,
allowing for explicit backend management
 2014-09-11 13:39:51 -06:00
Warren Turkal
0966dd2766 Make s3fs work better. 
S3 uses https ETag headers. In some cases (non-multipart uploaded
files), the ETag header is the md5sum of the file. In other cases
(multipart uploaded files) the Etag does not correspond to anything
calculable locally. In that case, files used for the salt filesystem
backend would be downloaded every time the s3 cache timeout expires (a
static 30 seconds). Fortunately, non-md5sum ETags have a hyphen in them.
This patch applies the following logic to such files. If the cached
file is the same size in bytes and has a later last modification time,
it will be considered up to date and will not be downloaded. Otherwise,
it will be updated.

(cherry picked from commit 858e5f9c1d)
Signed-off-by: Warren Turkal <wt@signalfuse.com>

Conflicts:
	salt/fileserver/s3fs.py
 2014-09-11 12:03:58 -07:00
Mike Place
278e66cd1e Some docstrings 2014-09-11 12:48:31 -06:00
Erik Johnson
8bcc418aa2 Re-enable test run SLS 
Now that the buildpackage stuff is ready, this no longer needs to be
commented out.
 2014-09-11 13:35:40 -05:00
Erik Johnson
cb31726500 Download packages only when buildpackage.py was run 2014-09-11 13:19:44 -05:00
Erik Johnson
e22c000d5c Create the build log in the artifact dir 
This allows the jenkins master to receive the log file even if the build
script aborted. Before I was just copying the log file to the artifact
dir at the end of the script, which meant that jenkins only gets the log
when the script succeeds.
 2014-09-11 13:08:40 -05:00
Erik Johnson
a146a80034 Fix tarfile name 2014-09-11 12:56:45 -05:00
Chris Rebert
b13843ad6c make _LXCConfig.as_string() more idiomatic Python 2014-09-11 10:49:45 -07:00
Chris Rebert
600466abe9 fix typos in lxc execution module 2014-09-11 10:47:42 -07:00
Erik Johnson
2256dc786a Fix path to cached packages 2014-09-11 12:42:40 -05:00
Joseph Hall
266428b069 Add salt-ssh roster for the minons cache on the master 2014-09-11 11:36:07 -06:00
Joseph Hall
2825c447b3 Merge pull request #15708 from s0undt3ch/2014.7 
Fix typo in comment
 2014-09-11 11:20:51 -06:00
Pedro Algarvio
da1fb62a67 Fix typo in comment 2014-09-11 18:18:39 +01:00
Erik Johnson
12ca973f10 Fix path for cp.push 2014-09-11 12:07:00 -05:00
Erik Johnson
8c89d7e193 Fix block comment 
I wasn't letting the prep sls run when testing package auto-builds
 2014-09-11 11:33:49 -05:00
Joseph Hall
6d2c494655 Add basic utils library for AWS 2014-09-11 10:17:47 -06:00
Thomas S Hatch
04873c9da7 don't need to check venv, raise cmdexecutionerrors in virtualenv mod 2014-09-11 09:18:50 -06:00
Thomas S Hatch
c558748b5f make exec_code run without a shell 2014-09-11 09:15:49 -06:00
loz-hurst
9031ea871a Fix broken back ticks in 68301c4 2014-09-11 16:15:35 +01:00
Michael Persson
3950002541 Code cleanup for operators 2014-09-11 17:04:32 +02:00
Nitin Madhok
122e0cfebb Making doc for tar_options more clear 2014-09-11 10:50:44 -04:00
Michael Persson
1e14508f59 Made cerberus optional only when using validation from terminal 2014-09-11 16:50:17 +02:00
Nitin Madhok
44bb241af9 Changing tar_options to v from G 2014-09-11 10:42:52 -04:00
Michael Persson
bf188471e7 Fixed typos in RST doc 2014-09-11 16:16:22 +02:00
Michael Persson
754c54b176 Fixed RST indentation again... 2014-09-11 16:07:23 +02:00
Michael Persson
12c2151662 Fixed typo in doc 2014-09-11 15:58:11 +02:00
Joseph Hall
c5a8d14ada Merge pull request #15686 from gtmanfred/develop 
kwargs should be ssh_kwargs for sftp_file
 2014-09-11 07:57:20 -06:00