Nitin Madhok
a34b74a70c
Fixing issue where --static option fails with ValueError Fixes #24776
2015-06-18 05:06:08 -04:00
Maxime Douailin
21e0cd4a5e
Fixed typo in lxc module: lvname parameter typo
2015-06-18 10:18:45 +02:00
Maxime Douailin
283d86ec12
Fixed bug in lxc module: lvname using wrong parameter in cmd
2015-06-18 10:18:14 +02:00
Thomas Jackson
b1211c5422
Re-enable tests for complex prereq and prereq_in
...
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
2015-06-17 21:57:37 -07:00
Thomas Jackson
378f6bfc36
Only merge when the merge is of requisites
...
Fix for #24770
This extends functionality is used for both requisites and extending SLSs, so instead of having a hard coded list of requisites we should use the global of all state requisite keywords.
2015-06-17 21:57:37 -07:00
Gareth J. Greenaway
5b0218b2f8
Initially adding a module to trigger events in IFTTT from Salt.
2015-06-17 21:49:41 -07:00
Michael Steed
f40a9d5cc0
Fix stacktrace in get_cli_returns()
...
Fix from #18994
2015-06-17 17:36:20 -06:00
rallytime
0dba3feb63
Change provider config refernces to driver in docs
2015-06-17 16:41:03 -06:00
Justin Findlay
7a26c2b5b9
disable pkg.hold test for RHEL/CentOS 5
2015-06-17 16:36:36 -06:00
Justin Findlay
4cacd93c22
use correct yum versionlock pkg name on centos 5
2015-06-17 16:10:08 -06: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
rallytime
391516ef03
Remove unreachable code from cloud/__init__.py
2015-06-17 15:53:00 -06:00
rallytime
2b8a955108
Also alias provider for driver when creating VMs without a profile
2015-06-17 15:51:56 -06:00
rallytime
841e86a8e0
Alias vm_['provider'] references to vm_['driver'] in vmware driver
2015-06-17 15:45:49 -06:00
rallytime
ea31f530ba
Alias vm_['provider'] references to vm_['driver'] in cloud drivers
2015-06-17 15:42:23 -06:00
Mike Place
5fe4de8f62
Merge pull request #24766 from msteed/undoc-dns_check
...
Remove doc references to obsolete minion opt
2015-06-17 15:36:55 -06:00
Michael Steed
f92a769d35
Remove doc references to obsolete minion opt
2015-06-17 15:29:50 -06:00
rallytime
10d58d72b6
Deprecate using "provider" in favor of "driver" in cloud provider files
2015-06-17 15:27:39 -06: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
a407ab7c51
Merge pull request #24329 from jayeshka/postgres_database-states-unit-test
...
adding states/postgres_database unit test case.
2015-06-17 13:11:02 -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
3ff6eff546
Merge pull request #24632 from jacobhammons/bug-fixes
...
Doc bug fixes
2015-06-17 12:40:02 -06: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
9995f64428
Merge pull request #24607 from garethgreenaway/2015_5_sending_events_multi_master
...
fixes to minion.py
2015-06-17 12:16:42 -06:00
Ronald van Zantvoort
152b4fb2fa
nail in pylint newline coffin for temp
2015-06-17 20:01:43 +02: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
Justin Findlay
bf2dd94389
Merge pull request #24755 from rallytime/fix_setup_15
...
Remove SALT_CLOUD_REQS from setup.py
2015-06-17 11:42:25 -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
3d53d79476
Merge pull request #24740 from rallytime/bp-24720
...
Backport #24720 to 2015.5
2015-06-17 09:43:37 -07:00
Thomas S Hatch
ac2851be55
Merge pull request #24723 from rallytime/bp-20124
...
Back-port #20124 to 2015.5
2015-06-17 09:43:20 -07:00
