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
57,050 Commits 24 Branches 182 Tags 341 MiB
7d41d938f8
Commit Graph

57050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
justinta89
7d41d938f8 fixed merge conflict 2015-08-25 16:55:36 -06:00
justinta89
7be0750a2e removed subprocess import 2015-08-25 16:44:31 -06:00
justinta89
4790356e44 Rebased 2015-08-25 16:41:51 -06:00
Colton Myers
42d036ed9b Merge pull request #26608 from jacobhammons/release-notes 
2015.8.0 release notes and doc/conf.py updates
 2015-08-25 15:25:58 -06:00
Colton Myers
e2b72b8f8e Merge pull request #26646 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-25 15:15:14 -06:00
Colton Myers
8183da6fa8 Merge pull request #26645 from rallytime/bp-26390-and-related-changes 
Back-port #26390 to 2015.8
 2015-08-25 15:15:03 -06:00
Jacob Hammons
fefd7aa7e8 2015.8.0 release notes and doc/conf.py updates 2015-08-25 15:12:20 -06:00
David Boucha
5412a8a34c Merge pull request #26642 from twangboy/fix_26174 
Added function to render winrepo Jinja
 2015-08-25 15:59:55 -05:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
 2015-08-25 13:55:44 -06:00
David Boucha
bd6b9a62eb Merge pull request #26625 from twangboy/fix_26097 
Correctly detect packages with no version, docs
 2015-08-25 14:52:33 -05:00
twangboy
32665320f8 Fixed some lint 2015-08-25 13:49:19 -06:00
Pedro Algarvio
970bf325ce __pillar__ can be a boolean, don't assume it's a dict. 
Fixes #26559
 2015-08-25 13:30:18 -06:00
Pedro Algarvio
a4a3f7ff81 Make __grains__ and __salt__ available for log_handler modules 
Refs #26390
 2015-08-25 13:29:50 -06:00
Robert Allen
1c278ed792 Provides tagging of Sentry LogHandler events. 
By providing context within the logging events it becomes more effective
in multiple environments as well as addition details such as os, custom
grains, etc. This primarly shadow the functionality in the sentry
shipper with the exception of explicit introduction of the salt.loader
includes to enable the feature.
 2015-08-25 13:28:37 -06:00
Joseph Hall
723734308b Merge pull request #26575 from msteed/raasify-spm 
Update spm for integration into raas
 2015-08-25 12:51:42 -06:00
twangboy
0acf5808de Added function to render winrepo Jinja 2015-08-25 12:45:37 -06:00
Colton Myers
19c7a6d575 Merge pull request #26641 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-08-25 12:17:46 -06:00
Colton Myers
a5dafa436c Already fixed on 2015.5 2015-08-25 12:17:29 -06:00
Colton Myers
71c0898fb5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-08-25 12:15:26 -06:00
Shane Lee
99755e525d Merge pull request #26635 from cro/proxy_grains_on_windows 
Don't report windows as a proxy.
 2015-08-25 10:54:38 -06:00
Justin Findlay
4532f98a76 Merge pull request #26515 from bersace/salt-env-local-sls 
Defaults to current saltenv in state.sls
 2015-08-25 10:35:50 -06:00
C. R. Oldham
ec209110f4 Don't report proxy on windows. 2015-08-25 10:17:31 -06:00
twangboy
27112c7441 Fixed some lint 2015-08-24 18:23:43 -06:00
twangboy
020b20ec41 Correctly detect packages with no version, docs 2015-08-24 17:52:30 -06:00
Nicole Thomas
e36ba77bf5 Merge pull request #26622 from rallytime/cloud_test_fix 
[2015.8] Also add -Z to script args for cloud tests
 2015-08-24 16:45:36 -06:00
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
Nicole Thomas
2927859c8a Merge pull request #26620 from rallytime/more_script_args 
Also add -Z to script args for cloud tests
 2015-08-24 16:03:24 -06:00
rallytime
9ae27193d8 Also add -Z to script args for cloud tests 2015-08-24 16:02:26 -06:00
Nicole Thomas
2964700609 Merge pull request #26619 from rallytime/cloud-test-fixes 
Apply cloud test fixes from 2015.5 to 2015.8
 2015-08-24 15:49:33 -06:00
David Boucha
5522d87a11 Merge pull request #26603 from terminalmage/issue13550 
Fixes for git.latest, git module integration tests, etc.
 2015-08-24 16:47:16 -05:00
Nicole Thomas
ed166ebd4f Merge pull request #26618 from rallytime/pip-undate-cloud-tests 
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
 2015-08-24 15:15:24 -06:00
rallytime
0d6eebf3c3 Extra lines 2015-08-24 15:12:31 -06:00
rallytime
c69c918b46 Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:12:25 -06:00
rallytime
7b594ef6d6 Use an available image to test against 2015-08-24 15:12:19 -06:00
rallytime
5a2c8825ba Extra lines 2015-08-24 15:02:44 -06:00
rallytime
d28672b69e Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:01:30 -06:00
Michael Steed
79a76c5cfe fixes 
- improve unit test coverage & fix bugs exposed thereby
- lint
 2015-08-24 14:11:55 -06:00
Nicole Thomas
6d3927bed5 Merge pull request #26612 from rallytime/fix-do-list-images-test 
Use an available image to test against
 2015-08-24 13:09:18 -06:00
rallytime
1401255287 Use an available image to test against 2015-08-24 11:45:28 -06:00
Erik Johnson
f033571d7e No shell needed when checking git version 2015-08-24 11:32:51 -05:00
Erik Johnson
398f779d92 Add debug logging to troubleshoot worktree test failures 2015-08-24 10:44:08 -05:00
Erik Johnson
5789e8e29a Fix undefined variable 2015-08-24 10:33:22 -05:00
Erik Johnson
40d5e9a4fd Fix test=True reporting when action is dependent on fetch 2015-08-24 01:06:01 -05:00
Erik Johnson
2a6c4a7634 Properly handle short-SHA1 revs 2015-08-24 01:06:01 -05:00
Erik Johnson
b9b44a3434 Don't set global user.name or user.email if they already exist 2015-08-23 23:43:12 -05:00
Erik Johnson
33ea02b9d0 Add information on new arguments to release notes 
Also tweaked the wording and formatting for consistency.
 2015-08-23 22:36:48 -05:00
Erik Johnson
fc67a933f9 2 fixes, 1 functional change in git.latest state 
Fix 1: Non-fast-forward fetches are now detected and reported on better.
Added a force_fetch argument to force the fetch, and added a force
argument to the git.fetch function.
Fix 2: Added detection of changes to working environment so we can
report on uncommitted changes better when force_checkout is False.

Also deprecated the always_fetch argument a made it a no-op. The logic
for detecting when fetches need to be performed is now good enough that
this argument is unnecessary.

Removed some deprecated arguments from the function definition and moved
them to the kwargs, so they do not cause confusion with their
newly-renamed counterparts.
 2015-08-23 22:13:28 -05:00
Erik Johnson
7b42f081bb Add 'force' and 'refspecs' to git.fetch 
Also, no need to squelch all git commands, we're already redacting
http(s) basic auth. Removed the output_loglevel='quiet' from _git_run().
 2015-08-23 14:28:04 -05:00
Joseph Hall
991bbf63fe Merge pull request #26576 from rallytime/fix-14604 
Ensure GCE and EC2 configuration checks are correct
 2015-08-23 12:59:46 -06:00
Joseph Hall
746c0008a9 Merge pull request #26580 from rallytime/fix-12225 
Avoid race condition when assigning floating IPs to new VMs
 2015-08-23 12:58:48 -06:00