Pedro Algarvio
e0f4706ef6
Add array support to salt.utils.config (with unit tests)
2015-07-02 17:38:06 +01:00
Colton Myers
fac5c06c23
Add version number for Beryllium
2015-07-02 09:36:32 -06:00
Pedro Algarvio
f65501fff4
Merge pull request #25106 from s0undt3ch/features/raas-17-salt-cloud-ng
...
Minor refactor + Unit tests for salt.utils.config + minor changes to 2 cloud drivers
2015-07-02 11:58:34 +01:00
Pedro Algarvio
545d7e0a34
PyLint fixes
2015-07-02 10:10:25 +01:00
Pedro Algarvio
07167422ba
Also test pattern
2015-07-02 10:08:08 +01:00
Justin Findlay
576f1b8493
Merge pull request #25008 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-07-01 19:04:59 -06:00
Colton Myers
3c6f4a4842
Strip leading / for local file paths
2015-07-01 16:02:25 -06:00
David Boucha
9908412336
Merge pull request #25103 from UtahDave/develop
...
add missing namespaced function import
2015-07-01 14:02:42 -06:00
Pedro Algarvio
4d4e94b59c
Unit tests for salt.utils.config
2015-07-01 18:18:31 +01:00
Mike Place
dd80bec768
Merge pull request #25081 from gladiatr72/example-minion-config-master_type-adjustment
...
replace bad value for master_type in example minion config
2015-07-01 10:45:12 -06:00
David Boucha
df87bcf38d
add missing namespaced function import
2015-07-01 10:31:15 -06:00
David Boucha
8e04944f6c
Merge pull request #25102 from derBroBro/patch-1
...
Update win_network.py
2015-07-01 09:57:15 -06:00
Malte Brodersen
0310400c13
Update win_network.py
...
Typo (tab) fixed.
2015-07-01 16:46:18 +02:00
Malte Brodersen
b95c4ca091
Update win_network.py
...
issue solved if dns is set to dhcp (compare to None)
2015-07-01 16:03:30 +02:00
Pedro Algarvio
d98d44de61
Create a thinner base class for configuration items
...
In preparation for compound configuration items.
2015-07-01 14:15:13 +01:00
Pedro Algarvio
0f831431ff
Add __virtualname__ to the Cloudstack cloud driver.
2015-07-01 13:30:47 +01:00
Pedro Algarvio
a013b0fc44
Add __virtualname__ to the Alyiun cloud driver.
2015-07-01 13:30:37 +01:00
Mike Place
9a961cc30a
Merge pull request #25092 from cachedout/lint_develop
...
Lint develop
2015-06-30 15:37:07 -06:00
Mike Place
35d92ece3c
Lint develop
2015-06-30 15:36:43 -06:00
Thomas S Hatch
c940dbcb03
Merge pull request #24984 from twangboy/win_user
...
Win user
2015-06-30 14:54:50 -06:00
Mike Place
8d68778c0d
Merge pull request #25086 from cachedout/revert_zmq_test
...
Revert zmq test experiment
2015-06-30 14:38:57 -06:00
Mike Place
69b9f1781c
Revert zmq test experiment
2015-06-30 14:38:31 -06:00
Mike Place
639ca1b5b7
Merge pull request #25080 from cachedout/weakref_gc
...
Handle GC in weakref iter
2015-06-30 13:39:11 -06:00
Mike Place
52bad5fced
Merge pull request #25082 from cachedout/zmq_test
...
Change pub test to return global ioloop instance
2015-06-30 13:38:59 -06:00
Mike Place
8a5caf02c2
Change pub test to return global ioloop instance
...
This *could* be causing the intermetent failures on
unit.transport.zeromq_test.AsyncPubChannelTest.test_basic but it
is a bit of a shot in the dark.
2015-06-30 13:37:03 -06:00
Mike Place
bbf90f0ffe
Handle GC in weakref iter
...
There is an issue that's popping up during automated testing:
https://jenkins.saltstack.com/job/salt-linode-cent7/lastCompletedBuild/testReport/integration.modules.grains/TestModulesGrains/test_set_val/
This could be caused by the iteration of the dict keys triggering a GC,
thus cleaning up the value we are about to return. This attempts
to handle that condition by simply falling back to re-creating
a channel if this is the case.
cc: @jacksontj
2015-06-30 13:03:23 -06:00
Stephen D. Spencer
f6dbeaf0e4
replace bad value for master_type in example minion config
...
At some point, `standard` became an invalid argument for the master_type
minion config bit. The bootstrap script, perhaps naively, uses this
file to lay down a minion config for a newly bootstrapped system.
bootstrap.sh should probably just drop an empty /etc/salt/minion rather
than trying to set every available minion opt.
In lieu of wading into bootstrap*, this allows Minion.eval_master() to
not soil itself and continue on its merry way when not operating in one
of its more advanced contexts.
* mad props to the creators/maintainers of the bootstrap script. BASH makes
me want to cut myself, so I appreciate complex scripts that are so
very functional that I don't have to be responsible for
2015-06-30 13:50:41 -05:00
Pedro Algarvio
35c20a71d4
Merge pull request #25071 from s0undt3ch/features/raas-17-salt-cloud-ng
...
First working version of our JSON Schema DLS implementation.
2015-06-30 19:27:56 +01:00
Justin Findlay
328031f54f
Merge pull request #25059 from babilen/dev-influxdb-virtual
...
Add virtual functions to influxdb state modules
2015-06-30 11:56:50 -06:00
Pedro Algarvio
037129619c
Rename IntConfig to IntegerConfig
2015-06-30 18:44:21 +01:00
Pedro Algarvio
3dccb964a1
Make PyLint happier
2015-06-30 18:32:10 +01:00
Pedro Algarvio
3ac8131e27
Fixed a bug when defining the exclusive_minimum class attribute.
...
Disallow any unnamed arguments to be passed to configuration items.
Store the base classes argument names, in order when creating a new
instance.
2015-06-30 18:27:22 +01:00
Colton Myers
abc3c087b1
Merge pull request #25048 from terminalmage/version-aware-deb
...
Implement verson-aware binary package installation for APT
2015-06-30 11:09:51 -06:00
Pedro Algarvio
3e07802c6d
Merge pull request #25074 from techhat/spmmetadata
...
Update SPM-METADATA file format
2015-06-30 17:50:46 +01:00
Pedro Algarvio
dc175add15
Merge pull request #25072 from techhat/spm
...
Add man page for spm, change pillar to .orig
2015-06-30 17:50:23 +01:00
Pedro Algarvio
f314e1d84f
Do some type checking for the passed enum
2015-06-30 17:43:59 +01:00
Pedro Algarvio
9d63527ecf
Add SecretConfig support
2015-06-30 17:38:45 +01:00
Pedro Algarvio
6aef6c2801
Add IPv6 and Hostname config items. Updated docstrings.
2015-06-30 17:18:14 +01:00
Joseph Hall
e376e60f34
Update SPM-METADATA file format
2015-06-30 09:51:46 -06:00
Joseph Hall
1e4f7aa574
Add man page for spm, change pillar to .orig
2015-06-30 09:45:13 -06:00
Pedro Algarvio
82bfca8fce
Make PyLint a little happier
2015-06-30 16:42:50 +01:00
Pedro Algarvio
30775c587d
First working version of our JSON Schema DLS implementation.
...
Supports the basic types.
Refs saltstack/raas#17
2015-06-30 16:42:15 +01:00
Wolodja Wentland
7da98368ee
Add virtual functions to influxdb state modules
...
Fixes #24301
2015-06-30 16:14:23 +02:00
Pedro Algarvio
9a68f85408
Merge pull request #25066 from techhat/spm
...
Handle pillars and loader modules
2015-06-30 14:55:23 +01:00
Joseph Hall
393cbf2114
Document pillars and loader modules
2015-06-30 07:16:58 -06:00
Joseph Hall
cdc2eea8f8
Handle pillars and loader modules
2015-06-30 07:08:39 -06:00
Pedro Algarvio
d77f8fb18f
Merge pull request #25055 from techhat/spm
...
Default uid and gid to current user/group
2015-06-30 13:22:02 +01:00
Mike Place
2bae862674
Merge pull request #25056 from cachedout/spm_lint
...
Lint SPM
2015-06-29 23:31:26 -06:00
Mike Place
1991fb2eac
Lint SPM
2015-06-29 23:31:00 -06:00
Joseph Hall
c7efc9547b
Linting
2015-06-29 21:43:17 -06:00
