valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,100 Commits 24 Branches 182 Tags 341 MiB
a3b673cfca
Commit Graph

57100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorge Schrauwen
ebb63f15a6 create log directory for smartos esky package 2015-07-31 16:34:02 +00:00
Jorge Schrauwen
f4cdc70a55 Merge pull request #1 from saltstack/2015.8 
Sync 2015.8 with upstream
 2015-07-31 18:20:14 +02:00
Alejandro del Castillo
5337af9116 fix extra white space (pytlint) 
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2015-07-31 11:17:23 -05:00
twangboy
e797739a1b Removed normalize_name function 2015-07-31 10:15:12 -06:00
Thomas Jackson
833950fb1e Correct max_wait -> max_auth_wait in MultiMinion 
Fixes #25795
 2015-07-31 09:03:38 -07:00
Mike Place
8074c545ea Handle non-ascii in state log 
Closes #25810
 2015-07-31 09:40:25 -06:00
TheBigBear
c994d22696 Minor update to msi un-installer info 
The ```uninstaller`` string can be either the windows GUID (aka msi prodcut code) OR the URL to the msi file. Both options work to uninstall a msi installed software.
 2015-07-31 16:31:33 +01:00
confidential
821cd710d3 adding missing format string 2015-07-31 09:52:35 -05:00
Pedro Algarvio
d30a99a117 Merge pull request #25910 from terminalmage/issue25776 
Pass osarch to check_32()
 2015-07-31 13:12:36 +01:00
Daniel Hobley
bcd683edc2 Added package arguments to chocolatey install 2015-07-31 13:42:18 +02:00
Seth House
ecc94c2eb8 Sort Salt imports 2015-07-31 00:33:21 -06:00
Erik Johnson
ae473ce017 Pass osarch to check_32() 
This prevents a bunch of unnecessary calls to ``rpm --eval``.

Fixes #25776.
 2015-07-31 01:15:57 -05:00
Mike Place
903c0edc1f Merge pull request #25632 from TheScriptSage/develop 
Adding client_acl functionality to rest_cherrypy API.
 2015-07-30 17:38:22 -06:00
Mike Place
cf6b17984d Merge pull request #25849 from basepi/gpg.renderer.25774 
Repress template error for GPG renderer (can't seek an OrderedDict)
 2015-07-30 17:25:06 -06:00
Mike Place
9a569da4ee Merge pull request #25905 from rallytime/bp-25892 
Back-port #25982 to 2015.5
 2015-07-30 17:24:19 -06:00
TheBigBear
0d33bae104 Update 7-zip msi un-installer instructions 
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
 2015-07-30 17:24:04 -06:00
TheBigBear
333fbdde30 Update 7-zip msi un-installer instructions 
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
 2015-07-30 17:21:45 -06:00
David Murphy
897bab4d4f Fixes for pkgbuild, added support for dependencies building package 
(cherry picked from commit 1c86e0110f)
 2015-07-30 17:20:16 -06:00
David Murphy
b6c0da3e04 Fixed pylint errors 
(cherry picked from commit 142b50b900)
 2015-07-30 17:20:03 -06:00
David Murphy
aeacffd6d8 Added Debian execution module debbuild.py and rpmbuild.py fix 
Added build execution module for Debian 8 (jessie) to plug into
the pkgbuild module.  Also fixed rpmbuild.py to create .rpmmacros
file in builder's home directory.

(cherry picked from commit 8ba66fa257)
 2015-07-30 17:19:47 -06:00
Nicole Thomas
6a738c5c41 Merge pull request #25890 from rallytime/bp-25696 
Back-port #25698 to 2015.5
 2015-07-30 17:12:09 -06:00
Colton Myers
8abb21e206 Merge pull request #25894 from jacobhammons/bug-fixes 
Minor doc bug fixes
 2015-07-30 17:02:34 -06:00
Colton Myers
8bc87af645 Merge pull request #25892 from TheBigBear/patch-3 
Update 7-zip msi un-installer instructions
 2015-07-30 17:00:35 -06:00
rallytime
30cf39528d Allow the use of secgroup_name in addition to secgroup_id 2015-07-30 16:58:54 -06:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Alejandro del Castillo
4848224700 add support for nilrt 
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2015-07-30 17:48:15 -05:00
Mike Place
85fceb88b0 Merge pull request #25900 from cachedout/lint_25760 
Lint #25760
 2015-07-30 16:43:33 -06:00
Mike Place
109518cc81 Lint #25760 
Refs #25760
 2015-07-30 16:43:19 -06:00
Mike Place
5eda15d20c Merge pull request #25760 from bradthurber/issue_#25496_modern_interface_b64encode_b64decode 
PR to address issue #25496 add "modern" base64 encode/decode support
 2015-07-30 16:41:45 -06:00
rallytime
86d72f9465 Allow the use of image_name in addition to image_id 2015-07-30 16:37:17 -06:00
Justin Findlay
4795952847 rework syndic doc 2015-07-30 16:33:18 -06:00
Mike Place
59f53ac651 Merge pull request #25882 from t0rrant/patch-2 
virtualenv state module - add new argument for ignoring installed packages
 2015-07-30 16:10:11 -06:00
Mike Place
32019c5f77 Merge pull request #25868 from rallytime/bp-25404 
Back-port #25404 to 2015.8
 2015-07-30 16:09:42 -06:00
Mike Place
59e1680182 Merge pull request #25877 from rallytime/fix-24036 
Protect against passing a map file in addition to VM names with --destroy
 2015-07-30 15:55:45 -06:00
Mike Place
c4c9e40be6 Merge pull request #25870 from rallytime/bp-25824 
Back-port #25824 to 2015.5
 2015-07-30 15:54:35 -06:00
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Mike Place
c011511b1c Merge pull request #25896 from cachedout/lint_25876 
Lint
 2015-07-30 15:39:50 -06:00
Mike Place
1dc128b2f2 Lint 2015-07-30 15:39:34 -06:00
Mike Place
1b3ea19a9e Merge pull request #25876 from jacksontj/2015.8 
Fixes for 2015.8
 2015-07-30 15:38:12 -06:00
Colton Myers
93a182d9ea Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/man/salt.7
    salt/minion.py
    salt/modules/file.py
    salt/returners/carbon_return.py
 2015-07-30 15:31:10 -06:00
rallytime
6ef7979a72 Allow the use of datastore_name instead of datastore_id 2015-07-30 14:59:23 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Nicole Thomas
a0ab784216 Merge pull request #25815 from lyft/mongolab_telemetry_salt_module 
Mongolab telemetry salt module
 2015-07-30 14:23:22 -06:00
Justin Findlay
af2326af68 Merge pull request #25885 from t0rrant/patch-3 
Update Debian changelog
 2015-07-30 14:05:59 -06:00
Justin Findlay
85ddba5ee8 Merge pull request #25872 from dmurphy18/dgm_debbuilder 
Fixes for pkgbuild, added support for dependencies building package
 2015-07-30 13:56:42 -06:00
TheBigBear
97b6269df3 Update 7-zip msi un-installer instructions 
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
 2015-07-30 20:33:15 +01:00
rallytime
0211972fd7 Whitespace fix 2015-07-30 13:05:29 -06:00
Akhter Ali
7d68e49d98 Update schedule.py 
This is regarding issue #25577

There is technically nothing wrong with the documentation already placed, it's just keeping up with consistency.
 2015-07-30 12:53:21 -06:00
Thomas S Hatch
6ce0b3e5b8 Merge pull request #25875 from rallytime/bp-25862 
Back-port #25862 to 2015.5
 2015-07-30 11:34:02 -06:00