Mike Place
24d52ff66b
Merge pull request #40080 from cloudflare/statuspage-update
...
Improvements for the statuspage state
2017-03-16 14:46:16 -06:00
Mike Place
d5040a1c25
Merge pull request #40082 from cloudflare/update-capirca
...
Capirca should be able to use non-int ports
2017-03-16 14:44:53 -06:00
Mike Place
a870383387
newline for lint
2017-03-16 14:39:10 -06:00
Nicole Thomas
b12720a56f
Merge pull request #40088 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-16 13:58:43 -06:00
Erik Johnson
6b7ba07841
PY3 compatibility: don't use cmp in sorted()
2017-03-16 14:49:47 -05:00
Nicole Thomas
a01b52b9a3
Merge pull request #40090 from rallytime/bp-40056
...
Back-port #40056 to 2016.3
2017-03-16 13:42:57 -06:00
Thomas S Hatch
ae012db87a
update mention bot blacklist
2017-03-16 12:15:07 -06:00
Nicole Thomas
d1570bba4c
Merge pull request #40057 from cachedout/ollie_blacklist
...
More mentionbot blacklists
2017-03-16 12:10:10 -06:00
Nicole Thomas
d64dee46bd
Merge pull request #40061 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-16 11:16:52 -06:00
Nicole Thomas
0ac2e83d37
Merge branch '2016.3' into ollie_blacklist
2017-03-16 11:01:10 -06:00
Erik Johnson
3923305141
Sort list of minions in batch to make tests consistent
2017-03-16 12:00:38 -05:00
rallytime
626bd03885
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/runners/manage.py
2017-03-16 10:43:18 -06:00
Devin Christensen
dc0dbb5949
Fix documentation
2017-03-16 10:41:04 -06:00
Nicole Thomas
703ab23953
Merge pull request #40055 from rallytime/doc-build-warnings
...
Update "yaml" code-block references with "jinja" where needed
2017-03-16 10:30:37 -06:00
Devin Christensen
63491b5e6d
Add gpg ext pillar to decrypt all pillar data
2017-03-16 10:24:44 -06:00
Mircea Ulinic
e2da56c6b8
Strip unused import
2017-03-16 16:14:00 +00:00
Mircea Ulinic
451b9e70e5
Avoid global
2017-03-16 15:55:05 +00:00
Mircea Ulinic
897a2a37c3
VRF arg and better doc for ping and traceroute
2017-03-16 15:51:41 +00:00
Nicole Thomas
d36bdb1a6e
Merge pull request #40070 from Ch3LL/2016.3.6_release
...
update 2016.3.6 release notes with additional PR's
2017-03-16 09:43:21 -06:00
Nicole Thomas
e73a1d0e54
Merge pull request #40072 from meaksh/2016.11-handling-timeouts-for-manage.up-runner
...
[2016.11] Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call
2017-03-16 09:31:46 -06:00
Nicole Thomas
39a6392fa2
Merge pull request #40079 from cloudflare/add-logmod-doc
...
Add logmod doc
2017-03-16 09:12:29 -06:00
Mircea Ulinic
7410f201bd
Fix netacl state doc
2017-03-16 15:04:26 +00:00
Mircea Ulinic
edae0b385b
Fix doc link
2017-03-16 15:01:04 +00:00
Mircea Ulinic
6eab556c6f
Capirca should be able to use non-int ports
...
Adding feature to allow capirca_acl module to translate ports
specified using the service name to their integer value,
as mapped in the IANA /etc/services file
2017-03-16 14:57:10 +00:00
Mircea Ulinic
be2b98d16a
Improvements for the statuspage state
2017-03-16 14:17:17 +00:00
Mircea Ulinic
c92b42d9af
Add logmod doc
2017-03-16 14:00:39 +00:00
Mircea Ulinic
cd319e7e39
Add proxy kwarg to scheduler
2017-03-16 12:27:49 +00:00
Mircea Ulinic
c6e6dd1a04
ProxyMinion: correctly build the scheduler
2017-03-16 12:24:13 +00:00
Pablo Suárez Hernández
40246d3723
Allows to set custom timeouts for 'manage.up' and 'manage.status'
2017-03-16 09:01:56 +00:00
Pablo Suárez Hernández
ad232fdc01
Allows to set 'timeout' and 'gather_job_timeout' via kwargs
2017-03-16 09:01:56 +00:00
Pedro Algarvio
89eeba2354
Merge pull request #40069 from terminalmage/py3-tests
...
Test optimizations/fixes
2017-03-16 07:03:22 +00:00
Ch3LL
a1f8b49bd1
update 2016.3.6 release notes with additional PR's
2017-03-15 16:34:17 -06:00
Erik Johnson
5b71db29d5
Use user.present/absent states to manage user in virtualenv test
2017-03-15 17:18:25 -05:00
Erik Johnson
5f99b0482a
Don't use _ret as a variable name when ret is used in the same function
...
This makes the code much easier to read.
2017-03-15 17:17:48 -05:00
Erik Johnson
eb09901f36
Simplify the user state integration tests
...
Put the skipIf and the destructiveTest decorators on the class instead
of each function. Also added a user.absent to the tearDown to reduce
code duplication.
2017-03-15 17:16:34 -05:00
Erik Johnson
66596c6d75
Fail test if sudo is missing
2017-03-15 17:15:56 -05:00
Erik Johnson
9b3890b5f2
Fix network test for cases where no network settings are configured
...
This allows the test to pass inside a docker container where the
networking is managed by docker and not by the OS' network mangagment
daemon.
2017-03-15 17:14:29 -05:00
Jerome Fleury
f916feda78
add encoding support to file.manage and file.serialize
2017-03-15 14:58:43 -07:00
Joseph Hall
fd7c58e613
Add fetch function to cache runner
2017-03-15 15:37:17 -06:00
Jean Praloran
dc10a0c179
Remove max version check as it is quite blocking for upgrading dockercompose
2017-03-16 10:29:09 +13:00
Erik Johnson
e3cfd29d6b
Fix traceback when virtualenv.managed is invoked with nonexistant user
2017-03-15 16:26:26 -05:00
rallytime
148df32604
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-03-15 14:52:07 -06:00
Mike Place
6487953b36
Merge pull request #39898 from thatch45/catch_race
...
Catch a race condition...
2017-03-15 13:45:33 -06:00
Mike Place
8dcffc7751
Merge pull request #40018 from meaksh/2016.3-handling-timeouts-for-manage.up-runner
...
Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call
2017-03-15 13:43:00 -06:00
Mike Place
5734e2b0a8
Merge pull request #40027 from terminalmage/py3-tests
...
Update git state integration tests for PY3 compatibility
2017-03-15 13:40:55 -06:00
Mike Place
25b5ca9fc4
Merge pull request #40029 from twangboy/win_pkg_py3
...
Make pkg execution/state modules work on Py3 on Windows
2017-03-15 13:37:34 -06:00
Mike Place
5592c680b5
More mentionbot blacklists
2017-03-15 13:33:58 -06:00
Mike Place
22fc5299a2
Merge pull request #40038 from velom/fix-pip-freeze-parsing
...
correctly parse "pkg_name===version" from pip freeze
2017-03-15 13:30:02 -06:00
Mike Place
1936474b25
Merge pull request #40056 from thatch45/develop
...
update mention bot blacklist
2017-03-15 13:28:26 -06:00
Thomas S Hatch
95d8cd5466
syntax
2017-03-15 13:27:54 -06:00
