Nicole Thomas
39cd302686
Spelling fix ( #34154 )
2016-06-20 19:11:01 -04:00
Mike Place
2ecc4129b0
Automated test for sleeping minion ( #34149 )
...
Closes #34147
2016-06-20 19:07:55 -04:00
Thomas S Hatch
3543b90f5c
Merge pull request #34024 from richardscollin/system-date-module
...
Add get/set datetime functionality - system module
2016-06-20 13:38:17 -06:00
Thomas S Hatch
3dbf7119ce
Merge pull request #34088 from Unity-Technologies/osx/mac_defaults_absent
...
Osx/mac defaults absent
2016-06-20 13:30:40 -06:00
Collin Richards
b9b3d77430
Fix more pep8 issues
2016-06-20 12:05:05 -05:00
Nicole Thomas
3382bc5c28
Merge pull request #34076 from rallytime/merge-develop
...
[develop] Merge forward from 2016.3 to develop
2016-06-17 15:13:30 -04:00
Henrik Holmboe
523b2acae9
return_valute -> return_value ( #34091 )
2016-06-17 13:02:07 -04:00
rallytime
0f92f3420d
Change 'Suse' to 'SUSE' in inspect_collector_test
...
This is needed due to the change in #33564
2016-06-17 10:56:42 -06:00
Thomas S Hatch
c05296b035
Merge pull request #34004 from isbm/isbm-no-minionid-sorting-dev
...
Complete rewrite how Minion ID is generated (dev)
2016-06-17 09:15:58 -06:00
Daniel Hobley
182373344e
Moved to using run_all in the absent function
...
- Fixed unit tests
2016-06-17 16:13:38 +02:00
joelc
f16839c83b
typo
2016-06-17 08:31:49 -05:00
joelc
ec31f7a7d4
Adds delete functionality to mac_defaults
2016-06-17 08:25:42 -05:00
rallytime
d957c29704
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/master.py
- salt/utils/parsers.py
2016-06-16 17:08:39 -06:00
rallytime
f6bfaede21
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/topics/installation/index.rst
- salt/master.py
- salt/modules/mac_brew.py
- salt/modules/pacman.py
- salt/modules/solarisips.py
- salt/returners/postgres_local_cache.py
- salt/states/apache_module.py
- salt/utils/minions.py
- tests/unit/acl/client_test.py
2016-06-16 16:10:41 -06:00
Thomas S Hatch
5a792caa57
Merge pull request #34068 from jfindlay/disk_capacity
...
Add docs and tests to disk state
2016-06-16 15:18:13 -06:00
Thomas S Hatch
ccc07c8d32
Merge pull request #33762 from plastikos/bug-proxy_exit_status
...
[BUG] proxy exit status
2016-06-16 14:53:07 -06:00
rallytime
60561ac6fc
Add a test to check for disconnected minion messaging
2016-06-16 14:07:05 -06:00
Justin Findlay
dca04727b5
states.disk: rewrite unit tests
2016-06-16 12:49:36 -06:00
Thomas S Hatch
c76123767c
Merge pull request #33903 from meaksh/salt-os-family-does-not-detect-SLES-for-SAP
...
Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible
2016-06-16 11:21:09 -06:00
Thomas S Hatch
bf3e7c83b0
Merge pull request #33837 from lorengordon/masterless-orchestration
...
Support salt.state orchestration in masterless mode
2016-06-16 11:16:53 -06:00
rallytime
9d049e28e5
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/disk.py
2016-06-15 17:13:26 -06:00
Collin Richards
be4a7c3f43
Fix more pylint issues
2016-06-15 17:50:05 -05:00
Thomas S Hatch
73ff11585e
Merge pull request #33987 from isbm/isbm-inspectlib-cleanup
...
inspectlib cleanup
2016-06-15 16:09:31 -06:00
Nicole Thomas
f546a00dc9
Merge pull request #34025 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-15 15:41:00 -04:00
Nicole Thomas
b3751f481f
Fix wheel integration test ( #34040 )
2016-06-15 15:40:15 -04:00
Collin Richards
0ea317ce5f
Fix misc whitespace and formatting issues
2016-06-15 14:34:54 -05:00
Loren Gordon
f7fd2962cb
Update saltmod tests to use master __opts__
2016-06-15 14:12:53 -04:00
Bo Maryniuk
6dcdc59f7e
Fix lint: unused import
2016-06-15 14:41:43 +02:00
Bo Maryniuk
921c399305
Add unit test: addrinfo from the raw socket should be picked up if all other socket checks had failed to localhost
2016-06-15 14:09:12 +02:00
Bo Maryniuk
4df1b542de
Add unit test: check if FQDN is picked up
2016-06-15 14:08:41 +02:00
Bo Maryniuk
a31b7aedfc
Add unit test: minion ID should be localhost, if everything is localhost.
2016-06-15 14:08:13 +02:00
Bo Maryniuk
97ef3bdb76
Test fix: only non-localhost IP should persist
2016-06-15 14:07:29 +02:00
Bo Maryniuk
263c039db9
Test fix: look for attribute name only when other socket checks had failed
2016-06-15 14:06:50 +02:00
Bo Maryniuk
be00b90067
Remove unnecessary tests: no fallback to what was already looked at
2016-06-15 13:45:54 +02:00
Collin Richards
e505a8e852
Add get/set datetime functionality - system module
...
Implement {get,set}_system_{time,date_time,date} functions
in system module for posix/linux machines. These functions
already exist in the win_system module, however there isn't
currently a way to set the date/time on linux/posix systems.
Includes two methods for setting the date/time.
- Using the date program (posix)
- Using the linux function clock_settime function (linux)
Adds UTC functionality that isn't currently included in the windows
date/time module.
2016-06-14 17:19:21 -05:00
rallytime
77f44f3087
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/modules/aptpkg.py
- salt/modules/ebuild.py
- salt/modules/zypper.py
- salt/states/pkg.py
- tests/integration/output/output.py
2016-06-14 15:47:35 -06:00
Nicole Thomas
871f7966ce
Lint fix for #34000 ( #34005 )
2016-06-14 11:12:14 -04:00
Mike Place
f758e42172
Fix incorrectly written test ( #34000 )
...
This should be using the test suite method of generating opts
2016-06-14 11:10:21 -04:00
Bo Maryniuk
2dc9e693f5
Fix lint
2016-06-14 16:37:11 +02:00
Bo Maryniuk
ef84253e7e
Fix netmask test.
2016-06-14 16:34:44 +02:00
Bo Maryniuk
ffeaff003f
Fix typo
2016-06-14 16:33:18 +02:00
Bo Maryniuk
22f3bab2ca
Fix the documentation
2016-06-14 16:29:07 +02:00
Bo Maryniuk
085901470e
Add unit test check for non-localhost IP is accepted as a minion ID
2016-06-14 16:29:07 +02:00
Bo Maryniuk
bce6798e86
Add unit test to check if any of localhost or local IP addresses are filtered
2016-06-14 16:29:07 +02:00
Bo Maryniuk
47755c69ea
Add unit test to filter out localhost from the first occurrence
2016-06-14 16:29:07 +02:00
Bo Maryniuk
15ecb083e3
Add test for the first in line from platform.node is used (mostly)
2016-06-14 16:29:06 +02:00
Bo Maryniuk
eed433ec60
Add unit test to check on duplicate hostnames in the pool
2016-06-14 16:29:06 +02:00
Bo Maryniuk
71a3e91f57
Add unit test for check if the minion ID is distinct in the pool
2016-06-14 16:29:06 +02:00
Bo Maryniuk
a3266c6f2f
Fix network test for Solaris
2016-06-14 16:29:06 +02:00
Bo Maryniuk
2d4a9939a9
Rename network unit test into a proper name
2016-06-14 16:29:06 +02:00