Dmitry Kuzmenko
66653620de
Fix problem when no acl configured
2016-07-21 12:23:20 -06:00
Mike Place
17d14a6e49
Merge pull request #11 from twangboy/int_tests_cachedout
...
Fix duplicate import, circular reference
2016-07-20 15:45:51 -06:00
twangboy
8f29723160
Fix duplicate import, circular reference
2016-07-20 14:34:58 -07:00
Mike Place
3342b0c664
Merge remote-tracking branch 'twangboy/int_tests_cachedout' into int_tests_interfaces
2016-07-20 10:25:42 -06:00
Mike Place
ec8a6ebab3
Correct config test errors
2016-07-20 10:00:31 -06:00
Mike Place
03039c13e2
Lint
2016-07-20 10:00:31 -06:00
Mike Place
5f5d7193b0
Add interface to all configs
...
This got removed during the attempt to make the tests run on Windows.
I added them everywhere even though that's not strictly necessary.
Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
2016-07-20 10:00:31 -06:00
twangboy
4e56d28993
Add tcp_master settings to both masters
2016-07-20 10:00:31 -06:00
twangboy
b5b0b9ae4b
Add more info to --interactive report
2016-07-20 10:00:30 -06:00
twangboy
3833c008b2
Cleans up config parameters
2016-07-20 10:00:30 -06:00
twangboy
003e60f6c6
Add cachedir for minions and syndic
2016-07-20 10:00:30 -06:00
twangboy
81d7479dfb
Remove backtick
2016-07-20 10:00:30 -06:00
twangboy
c1ae2537f1
Remove configuration from configs
2016-07-20 10:00:30 -06:00
twangboy
68e5620b92
Check actual minion ports
...
For some reason this fixed the PYTHONPATH issue
2016-07-20 10:00:30 -06:00
twangboy
55b8ea664e
Remove redundant tcp_pull_port entry for minion
2016-07-20 10:00:30 -06:00
twangboy
79b5be6989
Add more descriptive report for interactive mode
2016-07-20 10:00:30 -06:00
twangboy
cfc82f4004
Fix lint
2016-07-20 10:00:30 -06:00
twangboy
54647eb7d8
Fix mem leak caused by pki_dir
2016-07-20 10:00:30 -06:00
twangboy
7f3f15378e
Make additional changes to master configs
2016-07-20 10:00:30 -06:00
twangboy
a33c5c15da
Fix master and sub_minion configs
2016-07-20 10:00:30 -06:00
twangboy
f55ba87bee
Fix configs, remove default values
2016-07-20 10:00:30 -06:00
twangboy
9b14dc0a6e
Add Pedro's suggestions
2016-07-20 10:00:30 -06:00
twangboy
9bc438e302
Fix subminion
2016-07-20 10:00:29 -06:00
twangboy
1805630fdc
Fix integration tests on windows
2016-07-20 10:00:29 -06:00
twangboy
f7fb4985c4
Add Pedro's suggestions
2016-07-20 10:00:29 -06:00
twangboy
785f5470fc
Fix subminion
2016-07-20 10:00:29 -06:00
twangboy
5bcb27e477
Fix integration tests on windows
2016-07-20 10:00:29 -06:00
Mike Place
cb1a0866c7
Merge pull request #34797 from cachedout/comment_vmadm_runner
...
Comment out localclient in vdadm runner
2016-07-19 17:01:24 -06:00
Mike Place
49e3f870e9
Comment out localclient in vdadm runner
...
Refs #34568
2016-07-19 16:59:32 -06:00
Mike Place
8b3b2cfe69
Merge pull request #34268 from DSRCompany/features/23194_publisher_acl_globing
...
Regex support in publisher ACL rules.
2016-07-19 15:37:06 -06:00
Mike Place
3eb49d35cc
Merge pull request #34786 from rallytime/iteritems-tests-dir
...
Remove all object.iteritems() references from the tests/ directory
2016-07-19 14:57:21 -06:00
twangboy
f960ded780
Gate SIGINT in shutdown routines for Windows
...
SIGINT not available in Windows
2016-07-19 13:48:03 -07:00
Nicole Thomas
b200e89f8e
Merge pull request #34787 from rallytime/merge-develop
...
[develop] Merge forward from 2016.3 to develop
2016-07-19 12:15:27 -06:00
Charles McLaughlin
21f88fcee3
Check for non-existant keys when updating PagerDuty escalation policies ( #34705 )
...
In particular, this allows repeat_enabled and num_loops to be passed to
pagerduty_escalation_policy.present.
Following the existing code, perhaps I should have done something like
this:
objects_differ = '{0} {1} {2}'.format(k, v, '')
But I don't see the value of objects_differ used as a string, only as
as a bool... so I set it as a bool.
By the way, salt/modules/pagerduty_util.py doesn't return 'changes'..
I'll open a seperate issue for that.
2016-07-19 12:13:32 -06:00
twangboy
c5245f6b24
Fix stack trace on Jenkins
2016-07-19 10:04:24 -07:00
rallytime
39bc093ee9
Merge branch '2016.3' into 'develop'
...
No conflicts.
2016-07-19 10:31:07 -06:00
Nicole Thomas
1617a7058a
Merge pull request #34784 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-19 10:30:18 -06:00
rallytime
7b0ad25b09
Remove iteritems() references from unit/transport/*.py files
2016-07-19 10:22:33 -06:00
rallytime
0ad8183973
Remove iteritems() references from unit/modules/*.py
2016-07-19 10:18:26 -06:00
rallytime
c8930339d3
Remove iteritems() references from integration tests
2016-07-19 10:15:23 -06:00
rallytime
3e032dc397
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-19 09:30:45 -06:00
Mike Place
bfd87b1218
Merge pull request #34733 from at0S/add-attach-eni-to-instance
...
Add an option to attach ENI to instance via name or id
2016-07-19 07:00:48 -06:00
Mike Place
ab0ee501ec
Merge pull request #34763 from cro/nebula_dns
...
Nebula dns
2016-07-19 06:58:28 -06:00
Mike Place
a4a737e966
Merge pull request #34755 from pass-by-value/aws_vpc_peering
...
Add support for aws VPC peering connections
2016-07-19 06:47:25 -06:00
Mike Place
58021035a9
Merge pull request #34773 from randomed/mysql-returner-startup/2015.8
...
Bugfix: Startup states on minions are not being written to mysql returner
2016-07-19 06:39:53 -06:00
Mike Place
6b22c29d06
Merge pull request #34764 from rallytime/six-iteritems
...
Change iteritems() to six.iteritems in modules, states, returners, etc.
2016-07-19 06:39:20 -06:00
Dave Ye
0cd55eb7d7
Add jid=req handling for mysql returner. It should also store the return jid into the jid list table.
2016-07-19 15:41:23 +10:00
Taras Yermolenko
707ed0e371
fixed lint violations
2016-07-19 10:58:19 +10:00
C. R. Oldham
398cdde4ff
Lint.
2016-07-18 16:28:20 -06:00
rallytime
4da27821e3
Rempve iteritems() reference from log4mongo_mod handler
2016-07-18 16:22:37 -06:00
