Mike Place
66939939c1
Merge pull request #24785 from The-Loeki/patch-1
...
Small utility function for deriving IPv6 SLAAC EUI-64 identifiers
2015-06-18 08:53:46 -06:00
Mike Place
b290b9b474
Merge pull request #24777 from nmadhok/develop
...
Fixing issue where --static option fails with ValueError Fixes #24776
2015-06-18 08:51:19 -06:00
Mike Place
4e7abeb48b
Merge pull request #24786 from chrismcmacken/develop
...
Adding a couple tests for the mysql.grant_exists
2015-06-18 08:41:48 -06:00
Mike Place
afc58bb92f
Merge pull request #24767 from dmyerscough/Fixing-doc-typo
...
Fixing spacing typo
2015-06-18 08:39:38 -06:00
Mike Place
f3120b3e2c
Merge pull request #24788 from cachedout/lint_24772
...
Lint and remove unused import
2015-06-18 08:39:02 -06:00
Mike Place
bf0a849072
Lint and remove unused import
...
Refs #24772
2015-06-18 08:38:28 -06:00
Mike Place
5c4bc1728b
Merge pull request #24772 from garethgreenaway/ifttt_module
...
Initially adding a module to trigger events in IFTTT from Salt.
2015-06-18 08:35:21 -06:00
Ronald van Zantvoort
036e654237
leading zero fix for mac2eui64
...
and update to improved mac input handling
2015-06-18 15:06:36 +02:00
Chris McMacken
3025ba1ec1
Adding a couple of tests for grant_exists
2015-06-18 08:00:23 -05:00
Ronald van Zantvoort
e1f08f120f
PyLint fix
...
Learned something today; an int automagically grows to a long apparently w00t
2015-06-18 14:48:55 +02:00
Ronald van Zantvoort
c944661580
Update network.py
2015-06-18 14:34:13 +02:00
Ronald van Zantvoort
26ce922342
Small utility function for deriving IPv6 SLAAC EUI-64 identifiers
...
`mac2eui64` will take a MAC and optional prefix, and generate the excepted EUI-64/SLAAC address from it
2015-06-18 14:12:26 +02:00
Nitin Madhok
a34b74a70c
Fixing issue where --static option fails with ValueError Fixes #24776
2015-06-18 05:06:08 -04:00
Gareth J. Greenaway
5b0218b2f8
Initially adding a module to trigger events in IFTTT from Salt.
2015-06-17 21:49:41 -07:00
Mike Place
99af7695e3
Merge pull request #24765 from cachedout/encoding_fallback
...
Fix extreme edge case where system encoding can not be detected
2015-06-17 16:01:28 -06:00
Damian Myerscough
916519c333
Fixing spacing typo
2015-06-17 14:54:58 -07:00
Mike Place
4cbf86a483
Fix extreme edge case where system encoding can not be detected
2015-06-17 14:35:31 -06:00
Mike Place
fc4d4912f0
Merge pull request #24764 from cachedout/ssh_syntax_error
...
Fix syntax error
2015-06-17 13:59:46 -06:00
Mike Place
b83d3862d3
Fix syntax error
2015-06-17 13:59:23 -06:00
Mike Place
3401f9d154
Merge pull request #24763 from cachedout/fix_lint_24590
...
Lint riak
2015-06-17 13:04:40 -06:00
Mike Place
511e24dc5f
Lint riak
2015-06-17 13:03:35 -06:00
Mike Place
c3fcef0d8a
Merge pull request #24590 from dmyerscough/riak-features
...
Additional riak functions
2015-06-17 13:03:19 -06:00
Thomas S Hatch
6e78a55d3e
Merge pull request #24741 from CameronNemo/upstart-enable-fix
...
Improve Upstart enable/disable handling
2015-06-17 11:59:22 -07:00
Mike Place
e99863cd1d
Merge pull request #23105 from ngrennan-inflection/salt-ssh-return-code
...
Fixing return code to be "1" instead of 0 when the return code of a run is something other than 0
2015-06-17 12:37:23 -06:00
Mike Place
f5e0ee1d34
Merge pull request #24762 from cachedout/boron_notes
...
Add Boron release notes
2015-06-17 12:30:11 -06:00
Mike Place
ae65d78cf4
Add Boron release notes
2015-06-17 12:29:49 -06:00
Mike Place
e6dcf3ab12
Merge pull request #24703 from mattmb/fix/onchanges-and-or
...
Multiple onchanges requisite behaviour
2015-06-17 12:26:39 -06:00
Mike Place
9b3ec4baa7
Merge pull request #24757 from cachedout/fix_pyobjects
...
Fix loader call in pyobjects
2015-06-17 11:59:29 -06:00
Justin Findlay
7f01edab76
Merge pull request #24756 from rallytime/fix_setup_develop
...
Remove SALT_CLOUD_REQS from setup.py --> develop
2015-06-17 11:42:51 -06:00
Mike Place
7b8609b6aa
Merge pull request #24760 from cachedout/issue_24084
...
Fix GPG in #24084
2015-06-17 11:33:17 -06:00
Mike Place
d6227bda96
Merge pull request #24084 from quantonganh/gpg-module-import-key
...
gpg module: fix result checking of import_key()
2015-06-17 11:32:51 -06:00
Cameron Norman
f3078174c8
Add missing import
2015-06-17 10:30:47 -07:00
Mike Place
a2f5b646ad
Switch to get to fix failing test
2015-06-17 11:30:08 -06:00
Cameron Norman
26e406a5ce
salt.modules.upstart: fix lint errors
2015-06-17 10:18:35 -07:00
Thomas S Hatch
999e6f7535
Merge pull request #24743 from The-Loeki/udevmodule
...
Contribution: Addition of udev information module
2015-06-17 10:18:01 -07:00
Mike Place
d877f4f775
Merge pull request #23383 from cachedout/remove_overstate
...
Overstate is dead. Long live orchestrate!
2015-06-17 11:14:52 -06:00
Mike Place
dab4eccd00
Remove overstate tests
2015-06-17 11:14:19 -06:00
Mike Place
6ff1468a84
Merge pull request #24706 from jacksontj/develop
...
Fix #23289 Workaround for pyzmq's inability to unregister sockets sometimes
2015-06-17 11:01:10 -06:00
Mike Place
091725d5ca
Merge pull request #24679 from cachedout/issue_24665
...
Include data in highstate outputter
2015-06-17 10:59:35 -06:00
Mike Place
909c1a2037
Lint
2015-06-17 10:59:18 -06:00
Thomas S Hatch
f51bb58b83
Merge pull request #24720 from TheScriptSage/develop
...
Issue 24621 - AD/LDAP Group Auth Issue
2015-06-17 09:43:08 -07:00
Thomas S Hatch
4e63e571e2
Merge pull request #24707 from rallytime/linode_rest
...
Move Linode driver to use REST API instead of libcloud/python-linode
2015-06-17 09:42:57 -07:00
Mike Place
1aab1bde56
Fix loader call in pyobjects
2015-06-17 10:17:47 -06:00
rallytime
9a6b159422
Remove SALT_CLOUD_REQS from setup.py --> develop
...
Since requirements/cloud.txt was removed, don't reference it in setup.py
2015-06-17 10:00:17 -06:00
Justin Findlay
2cfaae72e6
Merge pull request #24749 from obestwalter/patch-1
...
add windows specfic default for multiprocessing
2015-06-17 09:42:20 -06:00
Oliver Bestwalter
027bb2da76
add windows specfic default for multiprocessing
...
multiprocessing has to be set to false on windows and should be done automatically like it is done with ipc_mode
2015-06-17 14:41:32 +02:00
Ronald van Zantvoort
07da991cc2
CopyPasteFix is a difficult workflow
2015-06-17 12:33:34 +02:00
Ronald van Zantvoort
74250d506c
Doc fixes for udev
2015-06-17 12:22:53 +02:00
Ronald van Zantvoort
e8c7ebd1be
Addition of udev information module
2015-06-17 11:28:12 +02:00
Cameron Norman
03278bd973
Improve Upstart enable/disable handling
...
* Properly search for manual stanza instead of just override
* Handle "manual" stanzas in both override and regular conf files
* Do not try to disable/enable already enabled services
* Do not overwrite override files (use append) on disable
* Only delete empty override files on enable
2015-06-17 00:51:28 -07:00
