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
62,250 Commits 24 Branches 182 Tags 341 MiB
d949110993
Commit Graph

62250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix 
Use -O in the wget example in the bootstrap tutorial for the develop branch
 2016-07-07 10:30:46 -06:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
zer0def
6ce7cb9616 Gracefully handle non-XML output in GlusterFS execution module. (#34492) 
* Gracefully handle non-XML command output.

* Omit gluster command usage line.

* Remove unnecessary import.
 2016-07-06 17:12:30 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
Nicole Thomas
0f3f87fbc5 Update dnsmasq.get_config docs to use correct config_file param. (#34488) 
Fixes #34261
 2016-07-06 13:29:07 -04:00
Mike Place
e2f576e847 Merge pull request #34462 from terminalmage/git-describe-always 
Use --always when available to git describe
 2016-07-05 21:59:33 -06:00
Mike Place
85f1f18239 Merge pull request #34467 from rallytime/bp-34457 
Back-port #34457 to 2015.8
 2016-07-05 21:56:58 -06:00
Thomas S Hatch
9e15337b74 Merge pull request #34432 from twangboy/fix_file.append 
Fix file.append
 2016-07-05 17:14:22 -06:00
twangboy
13f11fddce Remove refactoring code 2016-07-05 15:15:03 -06:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
twangboy
b83392edea Remove len() in favor of boolean test 2016-07-05 13:52:07 -07:00
twangboy
4373408163 Fix line error 2016-07-05 14:48:45 -06:00
twangboy
2479b53e2f Fix erroneous report on newline code 2016-07-05 14:48:45 -06:00
twangboy
75b6ed1fd5 Change back to binary read 2016-07-05 14:48:45 -06:00
twangboy
65753cff6d Use os.linesep instead of \n 2016-07-05 14:48:45 -06:00
twangboy
a55d63f086 Fix object names 2016-07-05 14:48:45 -06:00
twangboy
3e2fe12e5e Add new line if missing 2016-07-05 14:48:45 -06:00
twangboy
0b7821c8db Fix file.append state 2016-07-05 14:48:45 -06:00
Ryan Lane
746883741f Only access key metadata if we found key metadata 2016-07-05 13:56:13 -06:00
Erik Johnson
6ef7ee198e Restrict use of --always to git 1.5.6 and newer 2016-07-05 13:57:22 -05:00
Erik Grinaker
c554b22fc8 modules/git: added --always parameter for git.describe(). 2016-07-05 13:52:23 -05:00
Mike Place
91e095bb41 Merge pull request #34429 from terminalmage/pkg-latest-versioncheck 
Skip version checking for targeted packages in pkg.latest state
 2016-07-05 11:50:41 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04:00
Nicole Thomas
7bb0868c66 Merge pull request #34451 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-05 11:57:54 -04:00
rallytime
55a91e22be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-05 09:13:50 -06:00
Mike Place
8c72ee56e4 Merge pull request #34435 from cachedout/backport_config_dir_integration 
Backport change to integraiton test suite
 2016-07-05 08:24:53 -06:00
Mike Place
0e2c71a537 Backport change to integraiton test suite 
Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
 2016-07-01 16:10:34 -06:00
Erik Johnson
667f31a72a Skip version checking for targeted packages in pkg.latest state 
The mere fact that we have run pkg.latest_version will tell us if an
upgrade is available, by the value for that package name being a
non-empty string. So, performing version-checking here is overkill.
 2016-07-01 13:36:15 -05:00
Mike Place
e65d1ae374 Merge pull request #34401 from terminalmage/rpm-version_cmp 
Use rpmdev-vercmp as a fallback for version comparison on RHEL5
 2016-07-01 10:42:24 -07:00
Mike Place
5ddf417432 Merge pull request #34366 from steverweber/fix_servicerestart 
Update service.py
 2016-07-01 10:40:31 -07:00
Mike Place
485454febb Merge pull request #34426 from cro/inotify-linux-only 
Document that inotify is Linux only
 2016-07-01 10:04:38 -07:00
C. R. Oldham
54a02f25ba Document that inotify is Linux only 2016-07-01 10:58:40 -06:00
Erik Johnson
7cefd4182d Use rpmdev-vercmp as a fallback for version comparison on RHEL5 
Resolves #34390.
 2016-06-30 15:29:16 -05:00
Mike Place
fe18bbb527 Merge pull request #34392 from cro/salt-cloud-doc-clarify 
Clarify that salt-cloud doesn't get installed by bootstrap
 2016-06-30 11:16:23 -07:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Mike Place
45b8fb10d7 Merge pull request #34373 from jtand/network_state_integration_test 
Network state integration test
 2016-06-30 08:05:44 -07:00
Erik Johnson
d6af1de0b7 Optimize pkg integration tests and add a couple new tests (#34377) 
* Remove redundant usage of destructiveTest decorator

* Remove unnecessary SLS file

This simple state can be run using run_state

* Explicitly order tests

* Use run_state instead of invoking state.sls

* Ensure only one refresh_db done during pkg integration tests

* Add pkg.latest test for package without an epoch

* Optimize pkg.latest_version usage in pkg integration tests

* Clarify outcome when only_upgrade is used

* Add pkg.latest test with only_upgrade=True
 2016-06-30 10:48:22 -04:00
Justin Anderson
1d24053e36 network.system sls file 2016-06-29 14:31:46 -06:00
Justin Anderson
4a9e6af542 network.routes sls file 2016-06-29 14:31:07 -06:00
Justin Anderson
76c90b2ef6 network.managed sls file 2016-06-29 14:30:23 -06:00
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -06:00
Mike Place
af8ef1e461 Merge pull request #34368 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-29 10:54:49 -07:00
rallytime
3bce0cb510 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/cloud/clouds/lxc.py
 2016-06-29 11:01:51 -06:00
Steve Weber
7847c39024 Update service.py 
stop service before start after __opts__[test] was checked
 2016-06-28 23:56:23 -04:00
Nicole Thomas
94e094652c Back-port #34324 to 2015.8 (#34344) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 16:35:32 -04:00
Nicole Thomas
11dc0203b0 Making salt-ssh pass proper return codes for jinja rendering errors (#34342) 2016-06-28 16:34:56 -04:00
Erik Johnson
f6bd1ad47e Revert py3modernize lint changes (#34339) 
* salt/__init__.py: revert py3modernize lint changes

* salt/cloud/clouds/vmware.py: revert py3modernize lint changes

* salt/modules/jboss7_cli.py: revert py3modernize lint changes

* salt/payload.py: revert py3modernize lint changes

* salt/serializers/yamlex.py: revert py3modernize lint changes

* salt/states/win_servermanager.py: use absolute imports

* salt/utils/args.py: revert py3modernize lint changes

* salt/utils/decorators/__init__.py: use __name__ instead of func_name

__name__ is py3-compatible and also works on builtins in py2, which
func_name does not.

* salt/utils/compat.py: revert py3modernize lint changes

* salt/utils/__init__.py: revert py3modernize lint changes

* salt/version.py: revert py3modernize lint changes

* tests/salt-tcpdump.py: revert py3modernize lint changes
 2016-06-28 16:04:02 -04:00
Mike Place
046bdaa9f2 Merge pull request #34306 from ghedo/iptables_flush_table 
Fix iptables.flush state: Do not force 'filter' table when flushing
 2016-06-28 12:03:14 -07:00