Justin Findlay
eca42b1d2a
Merge pull request #26237 from silenius/issue_26207
...
fix issue #26207
2015-08-12 09:20:54 -06:00
Nicole Thomas
90943ef847
Merge pull request #26244 from nmadhok/vmware-cloud-driver-additions-2015.8
...
Backport additions to VMware cloud driver from develop to 2015.8 branch
2015-08-12 08:53:57 -06:00
Nicole Thomas
83057e65b0
Merge pull request #26243 from nmadhok/vmware-cloud-driver-additions-develop
...
Adding avail_locations(), avail_sizes(), list_templates() to the VMware cloud driver
2015-08-12 08:52:52 -06:00
Nitin Madhok
fd7c365999
Lint Fix
2015-08-12 10:48:10 -04:00
Nitin Madhok
f0c2b9c5ef
Lint fix
2015-08-12 10:47:10 -04:00
Nitin Madhok
416a95cad6
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:44:20 -04:00
Nitin Madhok
7c33f0ad54
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:33:42 -04:00
Justin Findlay
7576193b4b
Merge pull request #26235 from sjorge/smartos-utils-helper
...
salt.utils.is_smartos_zone, inverse of is_smartos_globalzone
2015-08-12 08:27:15 -06:00
Nitin Madhok
dd02e0a967
Backport additions to VMware cloud driver from develop to 2015.8 branch
2015-08-12 10:07:05 -04:00
Nitin Madhok
bfe964140a
Adding avail_locations(), avail_sizes(), list_templates() to the VMware cloud driver
2015-08-12 10:02:47 -04:00
Julien Cigar
0d2d572380
fix issue #26207
2015-08-12 13:13:59 +02:00
Jorge Schrauwen
483de86df5
salt.utils.is_smartos_zone, inverse of is_smartos_globalzone, inversint it with not could give errorous results.
2015-08-12 07:14:30 +00:00
Colton Myers
426b1631c6
Remove stray subscribe
2015-08-11 23:12:18 -06:00
Colton Myers
a7fcc49911
connect_pub call replaces subscribe call
2015-08-11 23:10:47 -06:00
Colton Myers
4e35a0ee01
Use list comp instead of filter (py3 compat)
2015-08-11 23:02:09 -06:00
Gareth J. Greenaway
a775a805f9
Removing unneeded logging.
2015-08-11 20:59:32 -07:00
Gareth J. Greenaway
6b30e01949
Adding a GPG state to ensure GPG keys are present or absent in keychains. Also fixing an issue when trusting keys.
2015-08-11 20:39:46 -07:00
Justin Findlay
5727d338a4
Merge pull request #26229 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-11 19:25:09 -06:00
Mike Place
8e3f1bd946
Merge pull request #26225 from rallytime/action_arg_parsing
...
Treat --action kwargs the same as --function kwargs
2015-08-11 19:11:00 -06:00
Colton Myers
110cae3cdc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-11 18:14:31 -06:00
Colton Myers
1502a39779
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
conf/minion
salt/client/__init__.py
salt/states/dockerio.py
salt/utils/event.py
tests/unit/utils/event_test.py
2015-08-11 18:12:21 -06:00
rallytime
49352725c6
Make error message more polite.
2015-08-11 17:05:48 -06:00
rallytime
ac12bde29d
Provide more helpful error instead of stacktracing if service isn't running
...
Fixes #25463
2015-08-11 16:59:41 -06:00
rallytime
92eba02485
Escape \ in CLI Examples
2015-08-11 16:52:59 -06:00
Mike Place
50d28e0371
Merge pull request #26223 from rallytime/one-fixes
...
Doc clean up for the OpenNebula driver
2015-08-11 16:23:05 -06:00
rallytime
b6a4c46a1f
Treat --action kwargs the same as --function kwargs
2015-08-11 16:16:46 -06:00
Mike Place
229a0cef7b
Move local transport to fopen (just for consistency)
2015-08-11 16:07:32 -06:00
Mike Place
c68a537309
Move pkgrepo to fopen
2015-08-11 16:05:24 -06:00
Mike Place
d4d7326101
Move file state to fopen over open
2015-08-11 16:05:08 -06:00
Mike Place
0b63baa5d1
Move loader to fopen
2015-08-11 16:05:00 -06:00
rallytime
7504dc3e1f
Escape \ chars for CLI Examples
2015-08-11 16:02:50 -06:00
Mike Place
9b68f9df0a
Migrate btmp beacon to fopen
2015-08-11 16:01:19 -06:00
Mike Place
b5980ca54a
Migrate wtmp beacon to fopen
2015-08-11 15:57:04 -06:00
rallytime
6ce0feb59c
A few more doc fixes for the OpenNebula driver
2015-08-11 15:50:44 -06:00
Mike Place
1492a14ea5
Merge pull request #26221 from sjorge/smartos-grains
...
SmartOS grain fixes
2015-08-11 15:45:14 -06:00
Jorge Schrauwen
22acfa1320
fix ip adres issues on SunOS/SmartOS
2015-08-11 20:59:19 +00:00
Mike Place
8e992f23d0
Merge pull request #26218 from terminalmage/issue4699
...
Add warning about file.recurse unicode errors with vim swap files.
2015-08-11 14:21:08 -06:00
Erik Johnson
9c155e0c1a
Add warning about file.recurse unicode errors with vim swap files.
...
Fixes #4699 .
2015-08-11 15:16:44 -05:00
Jorge Schrauwen
06df3ef7c1
SunOS should use isainfo to figureout osarch.
...
Info from isainfo manpage
-k
Prints the name of the instruction set(s) used by the
operating
system kernel components such as device drivers and STREAMS
modules.
2015-08-11 18:36:11 +00:00
Justin Findlay
d69f50e848
Merge pull request #26214 from rallytime/bp-24878
...
Back-port #24878 to 2015.8
2015-08-11 12:27:59 -06:00
Jorge Schrauwen
749cc419ec
Just skip the smbios stuff on SmartOS regardless, even if smbios works
...
in the global zone, it is not compatible!
Usage: smbios [-BeOsx] [-i id] [-t type] [-w file] [file]
-B disable header validation for broken BIOSes
-e display SMBIOS entry point information
-i display only the specified structure
-O display obsolete structure types
-s display only a summary of structure identifiers and types
-t display only the specified structure type
-w write the raw data to the specified file
-x display raw data for structures
2015-08-11 18:23:30 +00:00
Jorge Schrauwen
ccd400a2f6
skip smbios grains on SmartOS when inside a zone
2015-08-11 18:14:17 +00:00
Jorge Schrauwen
cf74e49fca
tweak smartos release info
2015-08-11 17:49:34 +00:00
Seth House
4471c3f237
Add note about top-file only env assignment and the show_top() function
2015-08-11 11:29:33 -06:00
Seth House
5864111429
Minor spelling, style fixes
2015-08-11 11:29:25 -06:00
Mike Place
8ad37e0558
Remove debugger
2015-08-11 11:29:19 -06:00
Mike Place
05c21297de
Fix env ordering in merged list
2015-08-11 11:29:13 -06:00
Mike Place
a5522f1581
Removed incorrect default config
2015-08-11 11:29:06 -06:00
Mike Place
8ca0e59891
Lint
2015-08-11 11:28:59 -06:00
Mike Place
845d26f45e
Add top_file_merging_strategy to mopts
2015-08-11 11:28:54 -06:00
