Nicole Thomas
c14c46afde
Merge pull request #40014 from bodhi-space/develop
...
Extra tiny fix for undefined var in rarely used code path....
2017-03-14 12:08:34 -06:00
Nicole Thomas
dd2bcb7c26
Merge pull request #39888 from ni3mm4nd/module_grains
...
Add function for matching key/value grains
2017-03-14 11:36:40 -06:00
Nicole Thomas
bc49a4a8c5
Merge pull request #39997 from techhat/filterevents
...
Add event_filter to salt cloud
2017-03-14 11:24:23 -06:00
Nicole Thomas
42361596e9
Merge pull request #40009 from gtmanfred/develop
...
Use linux_distribution from distro if not in platform
2017-03-14 11:18:35 -06:00
Nicole Thomas
2714676a13
Merge pull request #39746 from terminalmage/pathutils
...
Add salt.utils.path
2017-03-14 11:00:34 -06:00
Nicole Thomas
350edbe7e6
Remove unused import in test_core.py
2017-03-14 10:28:42 -06:00
Nicole Thomas
9aca990c97
Merge pull request #40001 from jmickle/develop
...
updating documentation typos
2017-03-14 10:25:41 -06:00
Nicole Thomas
656a26fa3c
Merge pull request #39990 from cloudflare/fix-39983
...
Cache the napalm object and fetched grains separately
2017-03-14 10:19:52 -06:00
Jan Kadlec
a797a58ee6
Change function name to equals
2017-03-14 17:15:52 +01:00
Joseph Hall
367701c136
Lint
2017-03-14 10:04:10 -06:00
Tom Williams
6bf38920a7
Extra tiny fix for undefined var in rarely used code path....
2017-03-14 11:45:34 -04:00
Nicole Thomas
1c46f32dc4
Merge pull request #40006 from mirceaulinic/patch-3
...
Adding myself to AUTHORS
2017-03-14 09:20:50 -06:00
Daniel Wallace
b839193443
Use linux_distribution from distro if not in platform
...
http://bugs.python.org/issue1322
python 3.7 is deprecating the platform.{linux_distribution,dist}
functions. They are being moved to the `distro` module on pypi. This
adds support for using the distro module if platform does not have the
needed functions.
2017-03-14 10:09:47 -05:00
Mircea Ulinic
b2668e5bb7
Adding myself to AUTHORS
...
Not sure it really matters
2017-03-14 11:11:39 +00:00
Jonathan Mickle
2d3ae32d11
fixing 9
2017-03-13 17:54:38 -07:00
Jonathan Mickle
e01d5033ff
lowercase m
2017-03-13 17:51:54 -07:00
Jonathan Mickle
7243c511e9
one more
2017-03-13 17:49:41 -07:00
Jonathan Mickle
765e0c8f6f
updating documentation typos
2017-03-13 17:47:06 -07:00
Pedro Algarvio
9d146251b6
Merge pull request #39999 from rallytime/contributing-md
...
Move the CONTRIBUTING.rst file to a markdown file and clean it up
2017-03-14 00:01:53 +00:00
rallytime
2771550470
Change .rst syntax to .md syntax
2017-03-13 17:14:50 -06:00
Joseph Hall
dde48b3650
Add event_filter to salt cloud
2017-03-13 15:36:13 -06:00
rallytime
dfaddea749
Renamed .github/CONTRIBUTING.rst -> .github/CONTRIBUTING.md
2017-03-13 15:33:07 -06:00
Mike Place
23ee490551
Merge pull request #39992 from jmickle/develop
...
fixing capitalization of librato
2017-03-13 14:10:15 -06:00
Jonathan Mickle
010319d93e
fixing capitalization of librato
2017-03-13 11:38:01 -07:00
Mircea Ulinic
ff7be3a6df
Merge branch 'develop' into fix-39983
2017-03-13 18:32:10 +00:00
Mike Place
3dddbd405b
Merge pull request #39985 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-13 12:30:41 -06:00
Mike Place
db642d05e2
Merge pull request #39970 from twangboy/win_py3_installer
...
Win py3 installer
2017-03-13 12:29:39 -06:00
Mircea Ulinic
98444f1726
Retireve only the device opts
...
When running in a regular minion, retrieve only the opts
without creating the napalm driver object.
Doing so, we can avoid additional connections.
2017-03-13 18:29:12 +00:00
Mike Place
1e200b92e2
Merge pull request #39896 from cloudflare/not-always-alive
...
Add always_alive option for napalm proxy
2017-03-13 12:28:21 -06:00
Mircea Ulinic
33cbc22f23
Fix proxy url
2017-03-13 17:58:48 +00:00
Mircea Ulinic
fa30afed3e
Fix docstring for uptime grain
2017-03-13 17:57:02 +00:00
Mircea Ulinic
5bf330b6c3
Cache the napalm object and fetched grains separately
2017-03-13 17:45:57 +00:00
Mircea Ulinic
578dc2b4b3
Fix lint
2017-03-13 16:49:18 +00:00
Mircea Ulinic
eca3ff123f
running instead of runnin
2017-03-13 16:47:53 +00:00
Mircea Ulinic
c78d56b0ca
Extra wrap for sphinx autodoc
2017-03-13 16:46:40 +00:00
rallytime
ea0bb5a3b3
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-03-13 09:20:04 -06:00
Pedro Algarvio
0b8a9c44dd
Merge pull request #39979 from s0undt3ch/features/py3
...
The port attribute definition must come first
2017-03-12 18:07:50 +00:00
Pedro Algarvio
410b583a63
The port attribute definition must come first
2017-03-12 18:05:30 +00:00
twangboy
5f75ca71dd
Update dates in the env scripts
2017-03-11 22:21:40 -07:00
Pedro Algarvio
8aaf9aaab8
Merge pull request #39975 from s0undt3ch/features/py3
...
Don't hardcode the webserver port number
2017-03-11 23:42:44 +00:00
Pedro Algarvio
6fe53339ce
Gate class definitions
2017-03-11 19:46:23 +00:00
Pedro Algarvio
992a8c7294
Don't hardcode the webserver port number
2017-03-11 16:00:28 +00:00
Jan Kadlec
ea7faa0935
Rename function key_value_match to is
2017-03-11 07:35:24 +01:00
Mike Place
af242e1c51
Merge pull request #39864 from rallytime/remove-26-requirements
...
Remove the dev_python26.txt install file
2017-03-10 20:51:24 -07:00
Mike Place
199fffe20d
Merge pull request #39878 from skizunov/develop2
...
Avahi/Bonjour: Detect hostname or IP address change
2017-03-10 20:48:49 -07:00
Mike Place
81199d45da
Merge pull request #39958 from rallytime/add-github-pr-func
...
Add a function to list PRs to the GitHub execution module
2017-03-10 20:46:59 -07:00
Mike Place
a99e9f7f42
Merge pull request #39894 from gtmanfred/develop
...
add utils to engines
2017-03-10 20:38:25 -07:00
Mike Place
4d5adadebd
Merge pull request #39966 from techhat/armcache
...
Update Azure ARM cache
2017-03-10 20:35:04 -07:00
Mike Place
b77080587f
Merge pull request #39969 from bodhi-space/infra4506
...
INFRA-4506 - add list_rules() function to boto_cloudwatch module
2017-03-10 20:33:22 -07:00
Nicole Thomas
a00ad0c0bf
Merge pull request #39968 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-10 16:47:09 -07:00
