Mike Place
63f7fd4ab9
Merge pull request #15601 from cachedout/issue_15586
...
Stringify comment
2014-09-08 15:56:27 -06:00
Mike Place
29e7d7bca9
Stringify comment
...
Closes #15586
2014-09-08 15:05:17 -06:00
Colton Myers
37d2bb9df1
Merge pull request #15593 from rallytime/pylint
...
Pylint fix 2014.7
2014-09-08 14:33:29 -06:00
rallytime
690e85a089
Change expected return for deleting digital ocean instance
2014-09-08 14:13:26 -06:00
Joseph Hall
c000abfd30
Merge pull request #15595 from nshalman/smartos-esky-smf-2014.7
...
SmartOS Esky: Fix minion SMF manifest
2014-09-08 14:13:19 -06:00
Nahum Shalman
aa0e7209c5
SmartOS Esky: Fix minion SMF manifest
...
Some users reported an errror that SMF couldn't find auditconfig despite
the fact that the PATH is set correctly. Invoking with the full path
seems to fix the issue.
2014-09-08 16:07:48 -04:00
rallytime
b31bad4e4f
Pylint fix 2014.7
2014-09-08 13:23:16 -06:00
Erik Johnson
e45b816341
Uncomment test run code
...
I was unaware that the tests run using a hard-coded jenkins.py, so
commenting it out as I did has no effect.
2014-09-08 14:02:27 -05:00
Erik Johnson
9452709cb3
Lint fixes
2014-09-08 14:02:18 -05:00
Erik Johnson
ec842a754c
Add RPM building to jenkins.py
...
This is a work-in-progress commit. The running of the actual test suite
has been commented out to facilitate quicker testing of the RPM builds,
I will need to uncomment this before this is merged.
2014-09-08 12:23:44 -05:00
Erik Johnson
60e606d250
Fix relative paths, move build log to artifact dir
2014-09-08 12:07:29 -05:00
Pedro Algarvio
6021eb601d
Use the SSH option for port and not the CLI flag
2014-09-07 04:15:45 +01:00
Pedro Algarvio
2c374921f7
Two spaces before in-line comment
2014-09-07 04:12:23 +01:00
Pedro Algarvio
c2932abdc9
Add sftp_file function and prefer it over scp_file
2014-09-07 04:12:20 +01:00
Joseph Hall
2887ffb5bb
Merge pull request #15571 from s0undt3ch/2014.7
...
We want to get ALL output from the VT process.
2014-09-06 19:19:59 -06:00
Pedro Algarvio
4288304a0d
We want to get ALL output from the VT process.
2014-09-07 01:26:19 +01:00
Thomas S Hatch
0659075a99
Merge pull request #15562 from basepi/ldappass15551
...
Don't log the password on ldap auth failure
2014-09-06 16:28:42 -06:00
Joseph Hall
2bbf4d67a7
Merge pull request #15563 from rallytime/cloud_tests
...
Generate random instance names for nightly cloud tests
2014-09-06 06:17:58 -06:00
rallytime
1727d04701
Generate random cloud provider names on digital ocean
2014-09-05 15:57:00 -06:00
Erik Johnson
40ce199736
make logger global for buildpackage.py
2014-09-05 16:30:26 -05:00
Colton Myers
2121653048
Merge pull request #15553 from basepi/bp-15516
...
Backport #15516 to 2014.7
2014-09-05 15:01:06 -06:00
Colton Myers
e0bcaf7a51
Don't log the password on ldap auth failure
...
Fixes #15551
2014-09-05 14:59:15 -06:00
Erik Johnson
9ea317d510
Add spec file for git builds
2014-09-05 15:11:02 -05:00
rallytime
6de2a37ec8
Generate random cloud instance name on rackspace tests
2014-09-05 14:09:42 -06:00
Erik Johnson
aa9a0555e0
Add buildpackage.py
2014-09-05 15:04:46 -05:00
Joseph Hall
877d7bfbc0
Merge pull request #15501 from highlyunavailable/2014.7
...
Change getBareMetalInstances call to getHardware
2014-09-05 12:06:08 -06:00
Nitin Madhok
cbfb49af67
Adding optional tag in salt.states.dockerio.pushed
2014-09-05 11:57:08 -06:00
Nitin Madhok
330f65c228
Adding optional tag functionality to salt.modules.dockerio.push
2014-09-05 11:57:08 -06:00
Thomas S Hatch
904673befe
Merge pull request #15552 from thatch45/roster_master_config
...
Add docs for roster_file option
2014-09-05 11:56:06 -06:00
Thomas S Hatch
71c9bf4708
Add docs for roster_file option
2014-09-05 11:55:11 -06:00
Thomas S Hatch
66b853c3e8
Merge pull request #15550 from thatch45/2014.7
...
Fix #12810
2014-09-05 11:16:58 -06:00
Thomas S Hatch
1a90b5f96e
Fix #12810
2014-09-05 11:16:06 -06:00
Thomas S Hatch
05e167becb
Merge pull request #15539 from thatch45/ssh_module_deploy
...
Ssh module deploy
2014-09-05 10:36:26 -06:00
Thomas S Hatch
aaf728f09e
lint fix
2014-09-05 10:36:08 -06:00
rallytime
df504928b6
Update linode tests to use a randomly generated instance name
2014-09-05 09:23:40 -06:00
Thomas S Hatch
e86205a78d
It works! salt-ssh now autodeploys modules.
...
It happens in the shim, so it is inline with module type changes
without requireing a heavy deployment of a new thin tarball
2014-09-05 01:13:33 -06:00
Thomas S Hatch
62c84a6096
Check the validity of the entry before commiting the arg
2014-09-05 00:58:10 -06:00
Thomas S Hatch
b14a60e75f
Fix stack trace in write_odules
2014-09-05 00:56:12 -06:00
Thomas S Hatch
c6cb93d934
change the shim args for module loading
2014-09-04 23:58:00 -06:00
Thomas S Hatch
c9e2be9071
Pass module args to the shim
2014-09-04 23:54:50 -06:00
Thomas S Hatch
338385fb6e
Add mod_data routine
2014-09-04 23:24:32 -06:00
Thomas S Hatch
f98aebba0b
modify shim to accept the modules as base64
2014-09-04 22:07:04 -06:00
Joseph Hall
c7a4cfc894
Merge pull request #15536 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #160
2014-09-04 21:04:46 -06:00
Pedro Algarvio
d5c523d29e
Update 'doc/.tx/config' - Build #160
...
http://cookingwithsalt.org/job/salt/job/transifex/160/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-09-05 04:00:08 +01:00
Thomas S Hatch
e7c49ecae0
Merge pull request #15528 from thatch45/thin_dir
...
Use the user based thin dir for the states calls
2014-09-04 17:17:53 -06:00
Thomas S Hatch
70950a1543
Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call
...
deregister_instances and register_instances methods return True/False/None
2014-09-04 15:32:45 -06:00
Thomas S Hatch
fa579b9e01
Use the user based thing dir for the states calls
2014-09-04 15:19:24 -06:00
Thomas S Hatch
47cdefa33b
Merge pull request #15526 from basepi/fp-15378
...
Forward-port #15378 to 2014.7
2014-09-04 15:04:29 -06:00
Thomas S Hatch
9ea64cbc98
Merge pull request #15494 from basepi/bp-15340
...
Backport #15340 to 2014.7
2014-09-04 14:15:18 -06:00
Thomas S Hatch
033fe20083
Merge pull request #15521 from UtahDave/2014.7local
...
Add some detail to the CloudClient api doc
2014-09-04 14:13:00 -06:00
