Commit Graph

67778 Commits

Author SHA1 Message Date
Thomas S Hatch
b906859fce Fix for #33530 2016-05-26 09:22:44 -06:00
Mike Place
3a95f8a977 Merge pull request #33509 from twangboy/fix_arch
Detect System Architecture for Mac Build
2016-05-26 07:40:54 -07:00
Mike Place
0bc881b4da Merge pull request #33522 from jfindlay/mac_pkg
rework modules.mac_brew.latest_version to work around brew version inconsistency
2016-05-26 07:19:25 -07:00
Mike Place
518713f5e5 Merge pull request #33519 from jacobhammons/2016.3.0rel
New doc site layout, 2016.3.0 release note known issue additions
2016-05-26 06:53:21 -07:00
Justin Findlay
2781377b17 modules.mac_brew: update unit tests 2016-05-25 22:15:12 -06:00
Justin Findlay
0ed3598fc9 modules.mac_brew int tests: add latest_version test 2016-05-25 22:15:12 -06:00
Justin Findlay
8789c2d06d modules.mac_brew int tests: add list_upgrades,info_installed 2016-05-25 22:05:01 -06:00
Justin Findlay
be381e0fc9 modules.mac_brew int tests: move decorators to class
Also remove unneeded system grains code.
2016-05-25 22:05:01 -06:00
Justin Findlay
fa3ec8a2bf modules.mac_brew.latest_version: refactor to use standard methods
Also fix an error in the `pkg.latest` state function caused by a
difference in how brew reports versions for uninstalled vs installed
packages.
2016-05-25 22:05:01 -06:00
Justin Findlay
58492c29cf modules.mac_brew: add info_installed function 2016-05-25 22:05:01 -06:00
Justin Findlay
9abf8f4832 modules.mac_brew.list_upgrades: use brew's json output 2016-05-25 22:05:01 -06:00
Justin Findlay
77a4f5b01e modules.mac_brew: move retcode check to _call_brew 2016-05-25 22:05:01 -06:00
Jacob Hammons
a424c38f5d New doc site layout, 2016.3.0 release note known issue additions 2016-05-25 17:39:55 -06:00
Nicole Thomas
9199101ef2 Merge pull request #33508 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-25 14:34:49 -06:00
Salt Admin
7844059dcf Handle system architecture 2016-05-25 14:11:12 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3'
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
2016-05-25 13:44:21 -06:00
Nicole Thomas
5a6b037cbd Merge pull request #33507 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-25 13:14:41 -06:00
rallytime
03b0c97520 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
2016-05-25 12:26:00 -06:00
Mike Place
a43ffadcb7 Merge pull request #33505 from twangboy/fix_build_script
Fix build script where pip didn't work
2016-05-25 11:15:27 -07:00
twangboy
7d78e5d612 Fix build script where pip wouldn't work 2016-05-25 17:38:39 +00:00
Mike Place
ee76be3b0b Merge pull request #33503 from rallytime/fix-15252
Add docs about minion config file in standalone minion docs
2016-05-25 10:23:07 -07:00
Mike Place
6f7fda0354 Merge pull request #33486 from jtand/2015.5
Add docstring examples to glance.py [2015.5]
2016-05-25 10:21:22 -07:00
Mike Place
e9b648e461 Merge pull request #33474 from cachedout/issue_29451
Fix diskusage beacon
2016-05-25 10:10:53 -07:00
Mike Place
4cf40da7d7 Merge pull request #33076 from cachedout/win_grains
Avoid second grains load on windows multiprocessing
2016-05-25 10:10:06 -07:00
rallytime
cfc07f7641 Add docs about minion config file in standalone minion docs
Fixes #15252
2016-05-25 11:00:12 -06:00
Mike Place
3bfb6bf719 Merge pull request #33465 from meaksh/check-if-job-returns-successfully-2015.8
jobs.exit_success allow to check if a job has executed and exit successfully
2016-05-25 09:52:52 -07:00
Mike Place
70eb7b66f3 Merge pull request #33487 from jtand/glance_doc_fixes
Add docstring examples to glance.py and nova.py [2015.8]
2016-05-25 09:47:25 -07:00
Mike Place
56ea979916 Merge pull request #33481 from rallytime/fix-33423
Fix docs about etcd config options and add pillar_opts doc
2016-05-25 09:41:55 -07:00
Mike Place
2394cdc4bf Merge pull request #33490 from rallytime/fix-16319
Document the postgres.psql_query function
2016-05-25 09:41:22 -07:00
Mike Place
f72ec1479b Merge pull request #33482 from rallytime/pillar-opts-docs
Add pillar_opts docs to master.rst
2016-05-25 09:39:25 -07:00
Mike Place
ede232f0f1 Merge pull request #33480 from jfindlay/service_doc
states.service: minor doc updates
2016-05-25 09:38:14 -07:00
Justin Anderson
d1e210fff8 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2016-05-25 10:28:18 -06:00
Shane Lee
4f96cc1f54 Return full pending computer name (#33483) 2016-05-25 10:26:21 -06:00
Mike Place
a89be5e9d4 Use six.string_types in jobs runner (#33499)
Refs #33491
2016-05-25 10:02:38 -06:00
Mike Place
dc644b145d Merge pull request #33488 from rallytime/fix-18752
Add docs for the syndic_finger config
2016-05-25 08:23:10 -07:00
Thomas S Hatch
11acecc43e keep safteychek, we still need it for older configs (#33497) 2016-05-25 09:19:41 -06:00
Mike Place
2e24a04565 Merge pull request #33491 from BlaineAtAffirm/2015.8
fix jobs.list_jobs failing with search_target
2016-05-25 08:11:22 -07:00
Pablo Suárez Hernández
9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id() 2016-05-25 09:10:04 +01:00
Blaine Chatman
7599b18995 fix jobs.list_jobs failing with search_target 2016-05-24 17:56:45 -07:00
rallytime
0c5548f9d1 Document the postgres.psql_query function
Fixes #16319
2016-05-24 16:54:06 -06:00
rallytime
b0a9f4181f Add docs for the syndic_finger config
Fixes #18752
2016-05-24 16:10:43 -06:00
Justin Anderson
0b1cae05d9 Added docstring examples to glance methods and nova.list 2016-05-24 15:35:44 -06:00
Justin Anderson
ebf1256545 Don't need to check swift.head due to it having no body 2016-05-24 15:26:28 -06:00
Justin Anderson
ee2ae0ea8a Added docstring examples to glance.image_schema and schema_get 2016-05-24 15:16:07 -06:00
Justin Anderson
59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now. 2016-05-24 14:58:32 -06:00
rallytime
087564528d Add pillar_opts docs to master.rst 2016-05-24 13:26:24 -06:00
rallytime
7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc
Fixes #33423
2016-05-24 13:19:20 -06:00
Mike Place
1861af427e Merge pull request #33478 from rallytime/bp-32484
Back-port #32484 to 2015.8
2016-05-24 12:14:23 -07:00
Justin Findlay
29c00a1b1b states.service: clarify function description language 2016-05-24 12:30:06 -06:00
Mike Place
ce38ef3f0d Merge pull request #33463 from kev009/fbsd-disks-geom
Use geom to perform a safe and fast disks grain on FreeBSD
2016-05-24 11:28:31 -07:00