Mike Place
d129bf4961
Merge pull request #26657 from jfindlay/top_lint
...
top file compilation fixes
2015-08-26 10:00:34 -06:00
Justin Findlay
0cfe821680
Merge pull request #26659 from TheBigBear/patch-13
...
minor doc edits - spelling
2015-08-26 08:10:01 -06:00
TheBigBear
1d5395b27a
minor doc edits - spelling
2015-08-26 12:11:50 +01:00
Justin Findlay
1d404bd561
remove trailing whitespace in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2
change md code quoting to rst in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
ecc6ca2ab2
warn users about undefined top file merge ordering
2015-08-26 01:44:33 -06:00
Justin Findlay
81535bd5a7
check mopts and opts for top file configs
2015-08-26 01:44:33 -06:00
Justin Findlay
9ea49545bf
add default_top config to mopts
2015-08-26 01:44:33 -06:00
Justin Findlay
473170ecd6
remove unused top file configs, add comments
2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6
add default_top description to docs
2015-08-26 01:44:33 -06:00
Justin Findlay
7386e59087
Merge pull request #26654 from jfindlay/comp_doc
...
merge #26650
2015-08-25 18:22:02 -06:00
Justin Findlay
6cee6c104f
add doc to win_pkg.compare_versions
2015-08-25 18:20:38 -06:00
Colton Myers
b298b4e6a8
Merge pull request #26567 from jtand/git_fix
...
Added git version check to git module
2015-08-25 17:38:23 -06:00
Justin Findlay
dca15817fa
Merge pull request #26649 from twangboy/fix_win_repo
...
Fixed Lint for real in win_repo.py
2015-08-25 17:10:19 -06:00
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
twangboy
00971ac153
Added compare_versions to be used within jinja
2015-08-25 16:22:48 -06:00
twangboy
b7fd5032a5
I incorrectly ignored a lint error in a previous PR
2015-08-25 16:19:46 -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
