Commit Graph

75380 Commits

Author SHA1 Message Date
Jared McKnight
ca80e49a4d force use of keyword args for boto_asg.launch_configuration_exists 2016-11-03 12:25:47 -04:00
Jared McKnight
23cd5f7933 Fixed unnecessary parens in if statement 2016-11-02 19:58:46 -04:00
Jared McKnight
2e02763fa3 Allow specifying a VPC for named security groups 2016-11-02 10:38:08 -04:00
Alexandru Bleotu
c68281b9fa Get cluster gh (#37310)
* Added utils.vmware.get_cluster

- retrieves a cluster in datacenter based on its name

* Added tests for utils.vmware.get_cluster
2016-11-02 08:28:41 -06:00
Mike Place
5232d7f60c Merge pull request #37336 from benediktwerner/spacewalk-api
Spacewalk api
2016-11-02 21:19:04 +13:00
Mike Place
d27946420c Merge pull request #37344 from cloudflare/NTP-STATE-MODULE
Update for NTP state
2016-11-02 21:15:05 +13:00
Mike Place
f8e06488b4 Merge pull request #37349 from haeac/Fix_Bug_#37118
Pull request for Bug #37118
2016-11-02 21:06:58 +13:00
Mike Place
f54840fde8 Merge pull request #37362 from skizunov/develop4
Add --set-metadata option to salt-call
2016-11-02 20:52:51 +13:00
Mike Place
42c23b1841 Merge pull request #37366 from eradman/requirements
dev_python*.txt: use current SaltTesting and SaltPyLint modules
2016-11-02 20:50:26 +13:00
Mike Place
637eabf965 Merge pull request #37375 from lomeroe/lgpo_gpt_ini
add updating gpt.ini file when ADM template policies are modified (gp…
2016-11-02 20:08:21 +13:00
Mike Place
cfd8cc03cb Merge pull request #37320 from gtmanfred/develop
use the cache runner in the cache roster file to get grains
2016-11-02 20:02:42 +13:00
Mike Place
d0f33ab6b2 Merge pull request #37377 from cloudflare/NAPALM-ROUTE-MODULE
Napalm route module
2016-11-02 19:45:52 +13:00
Mike Place
38dd7ed3ca Merge pull request #37382 from rallytime/fix-36210
Update solarisips.list_upgrades refresh default to True
2016-11-02 19:36:54 +13:00
Mike Place
a85e4b6bbd Merge pull request #37393 from StackPointCloud/profitbricks_cloudapi_v3
ProfitBricks Cloud API v3 updates
2016-11-02 19:16:51 +13:00
Ethan Devenport
21e24a8125 Cloud API v3 updates including:
* Added server availability zone parameter.
* Added volume availability zone parameters.
* Added NAT parameter for private NIC.
* Updated documentation.
2016-11-01 21:37:53 +00:00
Ethan Moore
c1f210e31f _in_range_inclusive class method incorrectly called isinstance 2016-11-01 21:04:18 +00:00
Ethan Moore
349d880251 set_computer_policy and set_user_policy call "set" by the original function name (set) instead of the aliased function name set_ 2016-11-01 20:47:50 +00:00
Nicole Thomas
56ce44286e Merge pull request #37387 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-11-01 14:45:18 -06:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/status.py
2016-11-01 12:56:04 -06:00
Nicole Thomas
ba1e6cd1a6 Merge pull request #37384 from rallytime/merge-2016.11
[2016.11] Merge forward from carbon to 2016.11
2016-11-01 12:53:07 -06:00
Ethan Moore
27e12ff9f2 correct tool extension guid for user registry policies 2016-11-01 16:55:20 +00:00
rallytime
da79271aed Merge branch 'carbon' into '2016.11'
No conflicts.
2016-11-01 10:43:07 -06:00
Nicole Thomas
7115f8e79f Merge pull request #37380 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-11-01 10:42:06 -06:00
rallytime
3feb063413 Add kwarg default change to nitrogen release notes 2016-11-01 10:08:33 -06:00
rallytime
0d55ebcfac Update solarisips.list_upgrades refresh default to True
The refresh kwarg defaults to True in all of the other pkg execution
modules. This change updates the solarisips.list_upgrades refresh
kwarg to be True instead of False to be consistent with the other
pkg execution modules.

Fixes #36210
2016-11-01 09:57:30 -06:00
rallytime
b1d64448c8 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/utils/context.py
2016-11-01 09:33:29 -06:00
Thomas S Hatch
1a4833b3a1 Merge pull request #37279 from gtmanfred/2016.3
initialize super class of NamespacedDictWrapper
2016-11-01 09:12:49 -06:00
Thomas S Hatch
f0c37efb3c Merge pull request #37361 from rallytime/fix-36829
Remove --no-compress option from mac_package.install_app function
2016-11-01 09:12:25 -06:00
Thomas S Hatch
45f365e14f Merge pull request #37357 from rallytime/update-version-refs
Update remaining Carbon references to 2016.11.0
2016-11-01 09:07:05 -06:00
Alexandru Bleotu
b0aaebaab8 Update cluster gh (#37347)
* Added utils.vmware.update_cluster

- updates an existing cluster based on a configuration spec

* Added tests for utils.vmware.update_cluster
2016-11-01 09:01:20 -06:00
Mircea Ulinic
13086c580b
Doc for napalm_route 2016-11-01 14:56:23 +00:00
Mircea Ulinic
c182d9d9d7
New execution module: napalm_route 2016-11-01 14:54:07 +00:00
Daniel Wallace
c3e33c3b99 use the cache runner in the cache roster file to get grains
Instead of having to query each file individitually.
2016-11-01 09:38:34 -05:00
Ethan Moore
a13c3b2d60 spelling correction 2016-11-01 14:18:01 +00:00
Ethan Moore
4d1f1d2eb6 add updating gpt.ini file when ADM template policies are modified (gpt.ini file must exist with proper data for ADM policies to apply) 2016-11-01 14:12:44 +00:00
Eric Radman
e3f14ff298 dev_python*.txt: use current SaltTesting and SaltPyLint modules
Pinning SaltTesting to 2015.2.16 is not right--integration tests will
not run with this version. Let pip install the latest minimum version
instead.

Include SaltPyLint since anyone doing development work will also want to
run pylint.
2016-10-31 22:23:44 -04:00
Mike Place
547ddccf1e Merge pull request #37364 from cachedout/fix_status_mock
Fix status test
2016-11-01 12:08:12 +13:00
Mike Place
d69142a3a7
Fix status test
Correctly raise expected exception
2016-11-01 12:06:20 +13:00
Sergey Kizunov
c176f1d43b Add --set-metadata option to salt-call
Works the same as the `--metadata` option in the `salt` command.
Since `--metadata` was already taken in `salt-call` to mean
something else, went with `--set-metadata` for `salt-call`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-10-31 17:43:03 -05:00
rallytime
ba5583938b Update mac_package unit tests: remove --no-compress flag 2016-10-31 16:13:48 -06:00
rallytime
02f5625fd7 Remove --no-compress option from mac_package.install_app function
Fixes #36829

The `--no-compress` flag for the rsync command doesn't
exist in newer versions of rsync on OSX 10.x.
2016-10-31 16:05:25 -06:00
Thomas S Hatch
351175931c Merge pull request #37351 from jfindlay/mac_set
modules.mac_power: give macOS time to change setting
2016-10-31 13:15:40 -06:00
Nicole Thomas
5328bc8d99 Update man pages for 2016.11 (#37354) 2016-10-31 13:09:01 -06:00
rallytime
6332da5c44 Prep release notes for 2016.11 2016-10-31 13:05:24 -06:00
rallytime
d4364d284a Officially update version.py for carbon to be 2016.11.0 2016-10-31 11:46:00 -06:00
rallytime
adcceb633b Cleanup "carbon" refs and replace with 2016.11.0 2016-10-31 11:38:27 -06:00
Nicole Thomas
dde8c71408 Merge pull request #37352 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-10-31 11:20:18 -06:00
Mircea Ulinic
bf9513024f More features for NAPALM NTP module (#37343)
* More features for NTP module

* Lint & more doc
2016-10-31 10:23:07 -06:00
Mircea Ulinic
52498883b6 Small updates for the NAPALM BGP module doc (#37345) 2016-10-31 10:22:14 -06:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-10-31 10:15:25 -06:00