twangboy
56a6f6bb83
Fix changes
2016-05-27 11:33:52 -06:00
twangboy
8ebe99ec5e
Fix restart_needed
2016-05-27 11:33:52 -06:00
twangboy
6e478cbda0
Add restart needed
2016-05-27 11:33:52 -06:00
twangboy
72ebf26616
Add missing import
2016-05-27 11:33:52 -06:00
twangboy
193583be96
Use dictionary compare for changes in remove
2016-05-27 11:33:52 -06:00
twangboy
1ae7dd76c1
Use dictionary compare for changes
2016-05-27 11:33:52 -06:00
Mike Place
afd3c1b9bd
Merge pull request #33576 from rodacom/2016.3
...
Fix #33565 (typo causes invalid syntax)
2016-05-27 09:46:34 -07:00
Mihai Dinca
c7ae5907ee
Call zypper refresh after adding/modifying a repository
...
Calling `zypper --gpg-auto-import-keys refresh` is required after
adding/modifying a repository because `--gpg-auto-import-keys` doesn't
do anything when called with `zypper ar` or `zypper mr`.
Without calling `zypper --gpg-auto-import-keys refresh` here, calling
`zypper ref` after adding/removing would still ask for
accepting/rejecting the gpg key.
2016-05-27 16:17:10 +02:00
Tom LAREDO
9f7d81e0cc
Fix #33565
2016-05-27 13:18:38 +02:00
Mike Place
71145ddda7
Merge pull request #33549 from thatch45/33530
...
Fix for #33530
2016-05-26 12:26:00 -07:00
Mike Place
58d89d66e3
Merge pull request #33555 from cachedout/issue_33544
...
Fix crashing Maintenence process
2016-05-26 12:25:39 -07:00
Mike Place
4831c6a353
Merge pull request #33538 from alprs/fix-cmd_user_runas_deprecation_bug
...
Fix a KeyError if group is provided but not user in cmd states
2016-05-26 10:58:05 -07:00
Mike Place
5287a1b8c8
Merge pull request #33550 from saltstack/jacobhammons-patch-1
...
Fixes display of thorium docs
2016-05-26 10:57:05 -07:00
Mike Place
fe7ee7a470
Fix crashing Maintenence process
...
The first time through the loop we deleted the dir and then stack
traced the second time through the loop if we hit the other conditional.
Resolves #33544
2016-05-26 11:14:56 -06:00
jacobhammons
65df3a6fa2
Refs #33543
2016-05-26 09:58:42 -06:00
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
d052908729
Merge pull request #33501 from meaksh/zypper-download-check-signature-2015.8
...
unit tests for rpm.checksum() and zypper.download()
2016-05-26 07:34:27 -07:00
Mike Place
e2d0c4abb1
Merge pull request #33513 from rallytime/fix-33319
...
Add a section to the jinja docs about escaping jinja
2016-05-26 07:24:58 -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
fabc15e616
Merge pull request #33520 from jacobhammons/release-notes.8
...
Updated version numbers in the docs for the 2016.3.0 release
2016-05-26 07:15:00 -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
Andreas Lutro
c738a0de76
fix a KeyError if group is provided but not user
2016-05-26 15:10:05 +02:00
Pablo Suárez Hernández
eaaef25c79
lint issue fixed
2016-05-26 08:26:24 +01: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
42e358af7d
Updated version numbers in the docs for the 2016.3.0 release
2016-05-25 18:06:03 -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
rallytime
81c1471209
Add a section to the jinja docs about escaping jinja
...
Fixes #33319
2016-05-25 15:26:11 -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