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
100,787 Commits 24 Branches 182 Tags 341 MiB
f2aebf9cb5
Commit Graph

1213 Commits

Author SHA1 Message Date
Gareth J. Greenaway
11cd485a8b
Merge branch '2018.3' into merge-2019.2 
Conflicts:
   - doc/topics/installation/freebsd.rst
 2019-03-25 13:42:28 -07:00
Clint Armstrong
5c99dbdf1a
add test to expose ip not added to custom network #51723 2019-03-21 10:05:45 -04:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
 2019-02-15 15:09:36 -05:00
twangboy
d8d2b863a5
backport #50887 2019-02-13 17:31:13 -07:00
Daniel Wozniak
4abd9d0462
Merge branch '2019.2' into merge-2018.3 2019-02-13 01:12:52 -07:00
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-2018.3 
Conflicts:
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-proxy.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	doc/man/spm.1
	pkg/osx/build_env.sh
	salt/utils/dns.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/support/case.py
	tests/unit/utils/test_dns.py
 2019-02-11 15:45:43 -08:00
Gareth J. Greenaway
6e55164416
Merge branch '2019.2.0.rc1' into merge-2019.2.0rc1 
Conflicts:
	Gemfile
 2019-02-11 11:27:20 -08:00
Erik Johnson
4551ae1e3f
Fix invocation of user.list_users in test suite 
This function does not take an argument, so this causes a traceback in
the tearDown.
 2019-02-05 09:29:52 -06:00
Erik Johnson
a35c023fdc
Don't use a decorator that assumes /etc/apt/sources.list.d exists 
This will make the test fail on most platforms
 2019-01-31 19:47:11 -06:00
Erik Johnson
6a62e7912a
Add integration test for architecture support 2019-01-31 16:12:51 -06:00
Ch3LL
25ec653fd4
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - .codecov.yml
  - salt/modules/artifactory.py
 2019-01-25 13:19:07 -05:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg 2019-01-24 11:39:57 +00:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221 2019-01-23 08:26:20 -07:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure 2019-01-22 10:46:32 -07:00
Daniel A. Wozniak
ac978f0647
Fix 50221 regression test on Windows 2019-01-19 18:21:27 -07:00
Daniel A. Wozniak
65f38b5ab2
peserve newlines from pillar data for file.managed 2019-01-19 16:11:49 -07:00
Gareth J. Greenaway
a233dbc79a
Ensuring we can handle a string that contains single quote + an escaped double quote. 2019-01-18 12:45:09 -08:00
twangboy
b91b2c62f5
Backport PR# 50771 to 2018.3 branch 2019-01-16 15:54:17 -07:00
Daniel A. Wozniak
2518beaf87
Mark renderer test as flaky for mac tests 2019-01-11 12:39:20 -07:00
Gareth J. Greenaway
9c04986641
Merge branch '2018.3' into merge-fluorine 
Conflicts:
	doc/conf.py
	doc/topics/development/dunder_dictionaries.rst
	salt/client/ssh/ssh_py_shim.py
	salt/grains/core.py
	salt/modules/mysql.py
	salt/modules/state.py
 2018-12-20 17:20:42 -08:00
Gareth J. Greenaway
bcf8f06aa4
fixing lint 2018-12-18 16:48:14 -08:00
Gareth J. Greenaway
543ec7bc79
Ensure source_hash returned from get_source_sum is lowercase. 2018-12-18 16:51:26 -07:00
Ch3LL
10cb130eb6
Add tempfile import in file tests 2018-12-14 13:18:11 -05:00
Ch3LL
449fa2e7ee
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/templates/debian_ip/debian_eth.jinja
 2018-12-14 11:39:49 -05:00
Erik Johnson
fa7dd07077
Add an additional assert 2018-12-06 08:39:33 -06:00
Erik Johnson
0edd58cffb
Fix failing opensuse tests 2018-12-05 22:48:33 -06:00
Erik Johnson
be14517c5c
Make x509 tests use tempfiles instead of hard-coding them 
This keeps us from needing to manually clean them up in the tearDown
 2018-12-03 13:13:14 -06:00
Daniel A. Wozniak
7a2cbbf659 Fix failing jinja filter test 2018-11-30 23:15:59 -07:00
Erik Johnson
a394cd76f6
Update file integration tests to use decorator for tempdirs 2018-11-29 09:29:23 -06:00
rallytime
a02564c7c0
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/utils/win_dacl.py
 2018-11-05 14:06:42 -05:00
Gareth J. Greenaway
c2354a9cb1
Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs. 2018-11-01 16:47:02 -07:00
Gareth J. Greenaway
2390f471ce
Adding SaltReturnAssertsMixin back in 2018-11-01 15:22:18 -07:00
Gareth J. Greenaway
677d0908fd
Remove zookeeper reference. 2018-11-01 15:05:42 -07:00
Gareth J. Greenaway
f3dee43bf0
Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format. 2018-11-01 15:02:21 -07:00
Daniel Wallace
9746b894f1
mark ansiblegate test as flaky 2018-10-29 19:40:58 -05:00
Nicole Thomas
303f991f6a
Merge pull request #50225 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-10-26 09:32:36 -04:00
twangboy
c974db4e49
Revert some indenting 2018-10-25 17:18:57 -06:00
twangboy
593677ca82
Use the dedent helper function instead 2018-10-25 17:17:09 -06:00
twangboy
4cb7062fd7
Fix integration.states.test_file on Windows 
Fix hard-coded, unix-style line endings
 2018-10-25 16:50:24 -06:00
rallytime
8fed338708
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/spm/pkgfiles/local.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-10-25 10:31:06 -04:00
Daniel A. Wozniak
b77db48d77
Fix test_managed_file_with_grains_data on Windows 2018-10-23 22:58:09 -07:00
Nicole Thomas
c3387a70bf
Merge pull request #50093 from rallytime/flaky-lxd-tests 
Mark lxd_container integration tests as flaky
 2018-10-17 15:45:36 -04:00
Nicole Thomas
d0c68df885
Merge pull request #49878 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-10-17 13:58:31 -04:00
rallytime
045bb0df1d
Mark lxd_container integration tests as flaky 2018-10-17 10:28:17 -04:00
rallytime
eff2e6fa0b
Fix file patch tests on CentOS 6 2018-10-09 11:50:23 -04:00
rallytime
817d810a6f
Skip ansiblegate state integration test on CentOS 6 
This test is hanging the test suite when running on CentOS 6. I don't think
this has ever worked properly (this test is new to fluorine) on CentOS 6, so
this will need some further investigation.

Fixes https://github.com/saltstack/salt-jenkins/issues/1138

Skipping for now until we can come back to this.
 2018-10-04 11:27:10 -04:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
rallytime
dbbfb0d2d4
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/minion.py
  - salt/utils/data.py
 2018-09-30 12:36:52 -04:00
Mike Place
b7d904f4bb
Merge branch '2018.3' into issue-49043 2018-09-30 09:18:54 -05:00
Daniel Wozniak
ed35633a1f Revert diff newline change 2018-09-28 17:06:36 -07:00