twangboy
ebbf2b05ca
Fixed reg state module for None, 0, and '' values
2015-09-10 11:07:13 -06:00
Nicole Thomas
3e902e86b1
Merge pull request #26987 from rallytime/bp-26966
...
Back-port #26966 to 2015.5
2015-09-09 12:42:51 -06:00
Nicole Thomas
eddb532713
Merge pull request #26915 from rallytime/joyent-tests
...
Update Joyent Cloud Tests
2015-09-09 09:04:50 -06:00
Nicole Thomas
f86814b2a4
Merge pull request #26971 from rallytime/reactor-doc-fix
...
Fix a couple of typos in reactor docs
2015-09-09 09:03:54 -06:00
TheBigBear
6a29eac003
URL has changed
...
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-09 08:59:19 -06:00
Mike Place
57b1080f94
Merge pull request #26976 from saltstack/revert-26899-fix_26730
...
Revert "file.symlink gets windows account instead of root"
2015-09-08 16:44:19 -06:00
Thomas S Hatch
6dd54e6bec
Revert "file.symlink gets windows account instead of root"
2015-09-08 16:43:26 -06:00
Nicole Thomas
67be01f5fe
Merge pull request #26975 from whiteinge/rest_cherrypy-integration
...
Remove mocks from rest_cherrypy integration tests; fix groups check bug
2015-09-08 16:34:08 -06:00
Seth House
9a0989585b
Add additional 'groups' check to rest_cherrypy if groups are not used
...
Fixes #26974 .
2015-09-08 15:44:23 -06:00
Seth House
d68aefcfde
Remove mocks from rest_cherrypy integration tests
...
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
2015-09-08 15:40:06 -06:00
Seth House
2aa3da8911
Rename the rest_cherrypy tests to conform to our convention
...
Previously they conformed to the default unittest2 convention.
2015-09-08 15:40:06 -06:00
David Boucha
20a48f7f2e
Merge pull request #26899 from twangboy/fix_26730
...
file.symlink gets windows account instead of root
2015-09-08 16:14:29 -05:00
rallytime
0214daad19
Fix a couple of typos in reactor docs
2015-09-08 14:52:38 -06:00
Seth House
dbc6b862f4
Merge pull request #26960 from rallytime/cherrypy-docs
...
Fix bash code block formatting in CherryPy netapi docs
2015-09-08 12:14:11 -06:00
rallytime
c1420711db
Fix bash code block formatting
2015-09-08 11:31:53 -06:00
Justin Findlay
f733e048c9
Merge pull request #26940 from rallytime/api-doc-fix
...
Fix minor doc typo in client api
2015-09-07 22:15:00 -06:00
Justin Findlay
de9350466e
Merge pull request #26871 from rallytime/bp-26852
...
Back-port #26852 to 2015.5
2015-09-07 21:43:07 -06:00
rallytime
00fe6a225c
Fix minor doc typo in client api
2015-09-07 12:55:39 -06:00
rallytime
d4ad42d697
Update Joyent Cloud Tests
2015-09-04 12:23:05 -06:00
twangboy
9d9b3bb47a
file.symlink gets windows account instead of root
2015-09-03 16:50:04 -06:00
Colton Myers
5a4c8dd2f5
Only reference msgpack if it imported successfully
...
Fixes #26850
2015-09-02 17:47:57 -06:00
Mike Place
a563af29d3
Merge pull request #26851 from jacobhammons/doc-bugs
...
states/pkgrepo examples, suse installation updates
2015-09-02 12:29:09 -06:00
Jacob Hammons
ac3bd47440
states/pkgrepo examples, suse installation updates
...
Refs #26644
Refs #26638
2015-09-02 11:37:40 -06:00
Mike Place
5b1b934192
Merge pull request #26817 from jfindlay/grouparg
...
modify groupadd for rhel 5
2015-09-02 08:52:53 -06:00
Joseph Hall
cdc0ea2fe3
Merge pull request #26824 from pravka/fix-droplet-creation-from-snapshot-in-dov2
...
[salt-cloud] Fix creating droplet from snapshot in digital_ocean provider
2015-09-01 23:18:37 -06:00
Aaron Bell
00e3192536
removing log
2015-09-01 22:01:25 -04:00
Aaron Bell
e4a82d78d9
removing stringification of every value in the image dict
2015-09-01 21:59:03 -04:00
Justin Findlay
4af6951a4c
Merge pull request #26823 from joejulian/ctlfix
...
use dbus instead of localectl
2015-09-01 18:25:25 -06:00
Joe Julian
a9928cb143
pep8 fixes
2015-09-01 15:51:06 -07:00
Joe Julian
6108ec4280
Gated dbus for os families that use it
...
Gated the dbus include for os families that are currently using it
within this module at this time.
Renamed some defs to more appropriately express their function.
2015-09-01 15:19:49 -07:00
Mike Place
a1749b76b8
Merge pull request #26820 from jfindlay/ctlfix
...
add default param in _parse_localectl in locale mod
2015-09-01 16:02:17 -06:00
Mike Place
ff733547c4
Merge pull request #26821 from twangboy/fix_26788
...
Fixed user.rename function in windows
2015-09-01 16:01:50 -06:00
David Boucha
c892be3255
Merge pull request #26803 from twangboy/fix_26754
...
Added check for PyMySQL if MySQLdb import fails
2015-09-01 16:44:41 -05:00
Joe Julian
e154c7b16f
remove trailing spaces
2015-09-01 13:57:10 -07:00
Joe Julian
c1c1266cc3
fix indent change
2015-09-01 13:06:16 -07:00
Joe Julian
0a35320aa7
Use dbus directly
2015-09-01 12:41:35 -07:00
Aaron Bell
cdc2b4584a
fixing condition for slug check
2015-09-01 15:37:01 -04:00
twangboy
cf979e4877
Fixed user.rename function in windows
2015-09-01 13:06:06 -06:00
Justin Findlay
3a2c0d5fbb
add default param in _parse_localectl in locale mod
...
Fixes #26805 .
2015-09-01 12:07:37 -06:00
Mike Place
6edfa36083
Merge pull request #26815 from jfindlay/linstr
...
stringify linode id before performing str actions
2015-09-01 11:56:29 -06:00
Justin Findlay
82d33939f3
modify groupadd for rhel 5
...
Fixes #26804 .
2015-09-01 11:51:12 -06:00
Justin Findlay
2ff5823944
stringify linode id before performing str actions
...
Fixes #26798 . At the start of the provisioning process, linode reports
VM names by their linode ID, which is represented by the driver as an
integer.
2015-09-01 10:50:40 -06:00
Justin Findlay
135a8a64af
Merge pull request #26800 from jacobhammons/doc-fixes
...
Doc bug fixes
2015-08-31 23:40:09 -06:00
Jacob Hammons
5cca52a3c1
Fixed windows installer paths
...
Refs #25567
2015-08-31 20:20:44 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
twangboy
23576c65eb
Added check for PyMySQL if MySQLdb import fails
2015-08-31 17:02:47 -06:00
Jacob Hammons
992edc3bb8
Doc bug fixes
...
Refs #26192
Refs #26638
Refs #26644
Refs #26108
2015-08-31 16:05:50 -06:00
Joseph Hall
da161b9516
Merge pull request #26793 from rallytime/fix-name-stacktrace
...
Don't stacktrace if "name" is specified as a minion id in a map file
2015-08-31 13:24:25 -06:00
rallytime
8601e4b341
Don't stacktrace if "name" is specified as a minion id in a map file
...
Fixes #24021
2015-08-31 12:36:28 -06:00
Joseph Hall
7c8d0a09f6
Merge pull request #26790 from rallytime/saltify_docs
...
Update Saltify docs to be more accurate and helpful
2015-08-31 12:17:31 -06:00
