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
16,415 Commits 24 Branches 182 Tags 341 MiB
8a938c9a66
Commit Graph

16415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
363e6a383e Add salt.client to packages 2013-08-08 12:43:06 -06:00
Erik Johnson
94a305a633 Fix regression in binary package installation 
Pull #6461 caused a regression in which binary package installs of
64-bit packages broke on 64-bit systems. This commit fixes that
regression.
 2013-08-08 12:41:03 -05:00
Thomas S Hatch
8819cac627 Make client.py a package 2013-08-08 11:02:28 -06:00
Erik Johnson
326b25e543 Fix version specification in pip.installed states 
This commit includes one fix and one enhancement:

1. Version specification is more intelligent now, and checks the
   currently-installed version against the desired version or version
   range.

2. Version specification properly overrides upgrade=True (fixes #5270).
 2013-08-08 11:53:40 -05:00
Erik Johnson
2f8ba92969 apt: update pkg version comparison 
This commit removes the now-unnecessary "compare" function, and changes
perform_cmp to version_cmp, as well as replacing calls to them with
calls to the new function in salt.utils.
 2013-08-08 11:53:40 -05:00
Erik Johnson
4d096dd969 ebuild: update pkg version comparison, pep8 fixes 
This commit removes the now-unnecessary "compare" function, and changes
perform_cmp to version_cmp, as well as replacing calls to them with
calls to the new function in salt.utils.

Also made a number of pep8 fixes.
 2013-08-08 11:53:33 -05:00
Ethan Erchinger
0bef33db0c update man page and docstring in fileclient 2013-08-08 09:47:45 -07:00
Ethan Erchinger
a52f95278b Merge remote-tracking branch 'upstream/develop' into develop 
merge with upstream
 2013-08-08 09:35:50 -07:00
Erik Johnson
cd504aa668 pkgutil: update pkg version comparison 
This commit removes the old pkg version comparison functions, and
replaces calls to them with calls to the new function in salt.utils.
 2013-08-08 11:34:41 -05:00
Erik Johnson
2caac11754 Remove unnecessary comparison functions 
These functions only pointed to functions within pkg_resource.py, which
have since been moved to salt.utils. Remove these as they are now
unneeded.
 2013-08-08 11:32:54 -05:00
Erik Johnson
f8f08109ae Replace references to pkg.compare with new func in salt.utils 2013-08-08 11:28:13 -05:00
Erik Johnson
9fdc8f548e Remove version comparison code from pkg_resource module 
This code is no longer necessary, with the version comparison code moved
to salt.utils.
 2013-08-08 10:47:46 -05:00
Erik Johnson
1189ee4327 Add version comparison to salt.utils 
This commit adds version comparison functions like those used for
comparing package versions, so that version comparison can be used
anywhere in salt. Generic version comparison is used, unless a cmp
function is passed to salt.utils.compare_versions.
 2013-08-08 10:45:49 -05:00
Tor Hveem
2fbb9a550c Remove unused locking code 2013-08-08 14:29:47 +02:00
Joseph Hall
bbe480ac10 Merge pull request #6569 from danieljn/develop 
added date header to the smtp returner
 2013-08-08 05:14:53 -07:00
Tor Hveem
b1c2670582 Run git fetch after init 2013-08-08 14:10:32 +02:00
Daniel Nägele
98b4e1cb0d added date header to the smtp returner 2013-08-08 11:25:02 +02:00
Thomas S Hatch
e52ff22b35 start validating file collections for master side compiling 2013-08-08 01:06:44 -06:00
Thomas S Hatch
e10e5ea336 Fix json data loading into unicode at the wrong times 2013-08-08 00:32:11 -06:00
Thomas S Hatch
d941e05d49 more progress on the ssh state management 2013-08-08 00:11:34 -06:00
Thomas S Hatch
9253b2ab62 arg_str needs to be a string of everything passed to salt-ssh 2013-08-07 23:04:55 -06:00
Thomas S Hatch
f7f0530f12 Merge pull request #6566 from terminalmage/issue6545 
Fix regression in mount.mounted state
 2013-08-07 18:48:01 -07:00
Thomas S Hatch
4647e74c19 Merge pull request #6565 from kevinfrommelt/fix_query_mysql_module 
Fix query mysql module
 2013-08-07 18:46:22 -07:00
Thomas S Hatch
6ca1fc924d Merge pull request #6557 from basepi/stateerror6544 
Handle state declarations not formed as a list, Fix #6544
 2013-08-07 18:42:56 -07:00
Erik Johnson
9ad2bf785a Fix regression in mount.mounted state, improve reporting 
This fixes the regression from #6545. In addition, running this state in
test mode now properly identifies if the fstab entry exists but needs to
be modified, and reports this in the state output.
 2013-08-07 19:35:20 -05:00
Erik Johnson
37956cb2d2 Add a test mode to mount.set_fstab 
This allows the fstab to be checked to see if changes will be made. This
does not change the return value of this function in any way, but just
prevents the fstab from being rewritten if test=True.
 2013-08-07 19:25:51 -05:00
David Boucha
9f544c29c8 Merge pull request #6561 from whiteinge/grain-osfinger 
Added new "osfinger" grain
 2013-08-07 17:04:33 -07:00
Kevin Frommelt
30970c3cd3 Fixed check for None dbc 2013-08-07 18:46:15 -05:00
Kevin Frommelt
aca4d4cdc3 Move connection_args.update() to its own line 2013-08-07 18:43:44 -05:00
Pedro Algarvio
be5215257e Merge pull request #6562 from basepi/couchdbformatting 
Fix whitespace and formatting in couchdb returner
 2013-08-07 16:39:04 -07:00
Colton Myers
fbd2022ef7 Fix whitespace and formatting in couchdb returner 2013-08-07 16:40:08 -06:00
Thomas S Hatch
cb3beb5e76 Minior changes to manage openstack expectations 2013-08-07 16:25:17 -06:00
Seth House
f6898c2694 Added new "osfinger" grain 
This grain is a unique identifier for a given OS and OS version that can
also be used as the key in a dictionary. For example a fingerprint for
CentOS 5.9 would be "CentOS-5", a fingerprint for Precise would be
"Ubuntu-12.04".
 2013-08-07 16:25:15 -06:00
Colton Myers
130bab885a Handle state delcarations not formed as a list, Fix #6544 2013-08-07 16:07:36 -06:00
Colton Myers
3bd5156a27 Merge pull request #6559 from basepi/augeasformatting 
Fix formatting and pylint in augeas state
 2013-08-07 15:06:45 -07:00
Colton Myers
dc10a21428 Fix formatting and pylint in augeas state 2013-08-07 16:06:03 -06:00
Joseph Hall
7bab83ddd8 Merge pull request #6556 from danieljn/develop 
added status.diskusage to status.status_all
 2013-08-07 14:32:14 -07:00
Daniel Nägele
92567fe116 added status.diskusage to status.status_all 2013-08-07 23:14:55 +02:00
Luper Rouch
fafdfa1800 added support for order clauses in pillar top files 
Conflicts:
	tests/unit/pillar_test.py
 2013-08-07 22:57:42 +02:00
Seth House
f0e7211893 Added initial documentation on Salt Formulas 2013-08-07 14:34:47 -06:00
Seth House
db4d7bcb59 Added rST anchors to pillar and GitFS for easy cross-referencing 2013-08-07 14:34:47 -06:00
Seth House
db37dbc02c Added saltstack-formulas GitHub organization to extlinks config 
This allows making quick links to formula repositories such as:

    The fastest way to install EPEL is including the
    :formula:`epel-formula`.
 2013-08-07 14:34:47 -06:00
Thomas S Hatch
cb9daa58fe Merge pull request #6552 from SmithSamuelM/develop 
Fixed get_event and runner low
 2013-08-07 13:25:31 -07:00
Thomas S Hatch
4a1ebef8f2 Merge pull request #6551 from felskrone/add_new_job_event 
Add new job event
 2013-08-07 12:44:17 -07:00
Samuel M Smith
80a6d5da73 Fixed the get_event method 
Removed the spurious while loop timeout
 2013-08-07 13:39:53 -06:00
Volker Schwicking
de5b6291a9 again spacing :-) 2013-08-07 20:57:18 +02:00
Volker Schwicking
a3a6fd3e52 spacing fix 2013-08-07 20:56:19 +02:00
Volker Schwicking
86d9b354a3 added a new event announcement to the master when a new job is published 2013-08-07 20:53:53 +02:00
Samuel M Smith
588f1bb625 Merge branch 'develop' of https://github.com/SmithSamuelM/salt into develop 2013-08-07 09:38:42 -06:00
Joseph Hall
2ad25d0f99 Merge pull request #6550 from pkruithof/develop 
Added Augeas state module
 2013-08-07 05:19:17 -07:00