Thomas S Hatch
80f4aff88c
Merge pull request #7143 from s0undt3ch/hotfix/pip-tests
...
Adapt and fix the changes from #6833
2013-09-10 21:08:06 -07:00
Thomas S Hatch
e2ece028d9
Merge pull request #7137 from jesusaurus/call/id
...
Allow salt-call to specify alternate minion id
2013-09-10 21:07:37 -07:00
Joseph Hall
6558fe7e5d
Merge pull request #7163 from mgwilliams/utils-network
...
salt.utils.network: fix regex
2013-09-10 19:25:09 -07:00
Matthew Williams
6b76963d07
salt.utils.network: fix regex
2013-09-11 01:34:44 +00:00
Joseph Hall
53bb39a2a3
Merge pull request #7158 from KennethWilke/develop
...
More Keystone tenant stuff
2013-09-10 15:41:32 -07:00
KennethWilke
c9dacb07dd
fixed user tenant updating
2013-09-10 17:21:13 -05:00
KennethWilke
4338062da7
Tenant deletion in keystone modules
2013-09-10 16:40:20 -05:00
Joseph Hall
978ea4ed13
Merge pull request #7155 from terminalmage/docs
...
Add note regarding PATH issues to FAQ
2013-09-10 14:00:46 -07:00
Erik Johnson
3d3c2fefb8
Add note regarding PATH issues to FAQ
2013-09-10 15:59:10 -05:00
Thomas S Hatch
5bd251eab1
Merge pull request #7153 from dlanderson/fix_issue_6800
...
Fix issue 6800. cwd=target was being passed to _run_check which blew up ...
2013-09-10 12:56:04 -07:00
David Anderson
b383440302
Fix issue 6800. cwd=target was being passed to _run_check which blew up if target dir did not already exist.
2013-09-10 13:45:30 -06:00
Pedro Algarvio
725acec48b
track_processes is no longer a valid `kwarg'.
2013-09-10 17:49:38 +01:00
Joseph Hall
33474d7933
Merge pull request #7148 from holmboe/postgres-eof-marker
...
Add missing EOF marker
2013-09-10 06:58:41 -07:00
Henrik Holmboe
990a260a3e
Add missing EOF marker
2013-09-10 15:30:09 +02:00
Pedro Algarvio
298cee1ef2
Fix indentation issues.
2013-09-10 13:38:58 +01:00
Joseph Hall
dde02828fd
Merge pull request #7146 from joehealy/doc_typos
...
Fix for typos picked up by lintian
2013-09-10 05:23:13 -07:00
Joseph Hall
39c832a0b8
Merge pull request #7145 from holmboe/doc-ssh-roster
...
Fix mid-sentence stop, no reference to Rosters
2013-09-10 05:16:43 -07:00
Joe Healy
6c471a6d4a
Fix for typos picked up by lintian
2013-09-10 22:10:47 +10:00
Henrik Holmboe
4cb197c04a
Align comments
2013-09-10 13:45:00 +02:00
Henrik Holmboe
9591465b32
Fix mid-sentence stop, no reference
...
In addition to some other minor changes.
2013-09-10 13:41:53 +02:00
Pedro Algarvio
1a071c0d2f
opts not `options'
2013-09-10 12:21:41 +01:00
Pedro Algarvio
d7c2266eed
Set the proper variables to chain the remote reports download.
2013-09-10 12:15:39 +01:00
Pedro Algarvio
ddd68a4dc1
Grab the proper option name
2013-09-10 12:15:19 +01:00
Pedro Algarvio
40ba994141
Support "chained" remote reports download with the test run execution.
2013-09-10 12:05:59 +01:00
Pedro Algarvio
70937172ce
Adapt mocked tests to the changes in #6833
2013-09-10 11:13:16 +01:00
Pedro Algarvio
58b3d4957c
Don't include pip in the resulting packages if a prefix is being used, not the right one. Refs #6833 , #7130 .
2013-09-10 11:07:18 +01:00
Pedro Algarvio
fc5212dce0
Add a test case for #6833 . Refs #7130 .
2013-09-10 10:52:17 +01:00
Pedro Algarvio
bd707c4763
Finish what was started in 53abda36
2013-09-10 10:40:10 +01:00
David Anderson
4fac57389f
Fix issue #6833
2013-09-10 10:05:26 +01:00
Thomas S Hatch
efdcd50ab4
Add scan roster
2013-09-09 22:43:42 -06:00
Thomas S Hatch
53faeedc3f
Add Google's ipaddr.py
2013-09-09 22:11:35 -06:00
Thomas S Hatch
853b12aa2e
Add roster option
2013-09-09 21:19:39 -06:00
Thomas S Hatch
2d1f0c6a66
Add ability to static configure the roster
2013-09-09 21:15:57 -06:00
Erik Johnson
171d9c5bfb
Merge pull request #7139 from techhat/eventdocs
...
Adding additional information on firing events
2013-09-09 17:13:55 -07:00
Joseph Hall
46f8f15ad2
Adding additional information on firing events
2013-09-09 18:06:05 -06:00
Colton Myers
4706f32453
Revert "Fix issue #6833 "
...
This reverts commit f97d07fed0
2013-09-09 16:57:14 -06:00
Joseph Hall
1a1ac4d3d6
Merge pull request #7135 from KennethWilke/develop
...
added tenant_present keystone state
2013-09-09 15:46:34 -07:00
KennethWilke
ae27e02bc7
added tenant_present keystone state
2013-09-09 17:43:40 -05:00
K Jonathan Harker
6e56e46eb8
Allow salt-call to specify alternate minion id
2013-09-09 22:36:11 +00:00
Colton Myers
8657b81ace
Merge pull request #7132 from jinrou/develop
...
Added Scientific Linux OS Name and Family Mappings
2013-09-09 14:21:48 -07:00
Colton Myers
b980a49948
Merge pull request #7128 from s0undt3ch/hotfix/pip-tests
...
Add another pip installed VCS test case using `git+git://`
2013-09-09 14:04:43 -07:00
Colton Myers
561f6da929
Merge pull request #7129 from mattvryan/patch-1
...
On file.recurse don't recurse into directories that aren't direct descen...
2013-09-09 14:04:16 -07:00
Colton Myers
8359fa99c4
Merge pull request #7130 from dlanderson/fix_issue_6833
...
Fix issue #6833
2013-09-09 14:02:31 -07:00
Joseph Hall
082c8f2134
Merge pull request #7131 from terminalmage/docs
...
Typo fixes and further FAQ tweaks
2013-09-09 14:00:22 -07:00
Erik Johnson
338e4b0cf1
Typo fixes and further FAQ tweaks
2013-09-09 15:57:38 -05:00
Pedro Algarvio
5874f171b5
Re-work the report download steps.
2013-09-09 21:52:58 +01:00
Alexey Simakov
5f8b8995d9
"ScientificLinux" has been added to _OS_NAME_MAP and map "ScientificLinux" to "RedHat" in _OS_FAMILY_MAP
...
tested on Scientific Linux CERN SLC release 5.9 (Boron)
2013-09-10 00:51:52 +04:00
Matt Ryan
069145ee55
On file.recurse don't recurse into directories that aren't direct descendants
...
When getting files as recurse candidates in the file.recurse state, directories that are not descendants of the recurse source folder but which are descendants of the root folder are being included as candidates for being copied as a part of the state. With this change, once we have a relative filename, we check to see if the file is a descendant of the recurse root, and skip that file if that is true.
2013-09-09 14:47:22 -06:00
David Anderson
f97d07fed0
Fix issue #6833
2013-09-09 14:41:23 -06:00
Pedro Algarvio
22873f63bb
Add another pip installed VCS test case using git+git://
2013-09-09 20:53:52 +01:00
