rallytime
93a858c591
Added release note for 2014.7.5 release
2015-04-17 12:53:50 -06:00
Justin Findlay
977edf1755
Merge pull request #22794 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-17 12:49:52 -06:00
Justin Findlay
b88f7b06f1
Merge pull request #22793 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-04-17 12:49:42 -06:00
Justin Findlay
cfb7e97140
Merge pull request #22789 from julienlavergne/gitignore
...
added recursive for ignored vagrant project files
2015-04-17 12:49:17 -06:00
Justin Findlay
81a28af3bd
Merge pull request #22786 from rallytime/bp-21072
...
Backport #21072 to 2015.2
2015-04-17 12:44:26 -06:00
Justin Findlay
890c89cfd6
Merge pull request #22785 from junckritter/cloud-gce-disks
...
Allow additional parameters for GCE cloud profile
2015-04-17 12:43:46 -06:00
Nitin Madhok
faa2fd7e4e
Lint
2015-04-17 14:39:59 -04:00
Gareth J. Greenaway
d2eac55240
Adding validation bits to ensure beacon data is correct before adding.
2015-04-17 11:11:35 -07:00
Nicole Thomas
4d396e5e94
Merge pull request #22777 from jayeshka/apache_module-states-unit-test
...
adding states/apache_module unit test case
2015-04-17 12:08:01 -06:00
Nicole Thomas
d6ab56b88d
Merge pull request #22783 from eliasp/develop-states.group.present-typo
...
Fixed typo/grammar.
2015-04-17 12:05:10 -06:00
rallytime
1e4b93dec9
Python 3 compat fixes for develop
2015-04-17 12:00:01 -06:00
Nitin Madhok
964df532cc
Fixes #22792
2015-04-17 13:57:37 -04:00
Colton Myers
929b7baaf3
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-17 11:38:54 -06:00
Colton Myers
279e98aa6f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/loader.py
2015-04-17 11:37:58 -06:00
Nitin Madhok
59d8faab26
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-04-17 13:05:16 -04:00
Nitin Madhok
950fbce22e
Adding terminate() action to be able to immediately power off the VM
2015-04-17 12:58:35 -04:00
Joseph Hall
9c73abe174
Removing unused import
2015-04-17 10:52:08 -06:00
Julien Lavergne
1c91622fa6
added recursive ignored vagrant project files
2015-04-17 18:51:26 +02:00
Nitin Madhok
a0dde74240
Speeding up list_nodes_select() and few other tweaks
2015-04-17 12:45:17 -04:00
Matt Moersen
3d7f26d437
added function rescanHba
...
rescans a specific HBA on a host
2015-04-17 12:36:23 -04:00
Matt Moersen
e0b72395c5
fixed syntax errors
2015-04-17 11:52:20 -04:00
Matt Moersen
b8ce68e180
added function rescanAllHba
...
Function performs a rescan on all HBA’s on a specified host.
2015-04-17 11:48:38 -04:00
Joseph Hall
f9a38ce49d
Linting
2015-04-17 09:30:28 -06:00
FELD Boris
e436c37574
Add support for mongod indexes in mongo_future_return
2015-04-17 09:13:47 -06:00
Thomas S Hatch
871cdd72df
Merge pull request #22781 from eliasp/develop.pillar_ldap-doc-fixes
...
develop.pillar ldap doc fixes
2015-04-17 09:06:47 -06:00
Thomas S Hatch
e4f7da9946
Merge pull request #22773 from analogbyte/develop
...
smtp module: make multiple recipients work as expected
2015-04-17 08:43:39 -06:00
Thomas S Hatch
921a0e9da7
Merge pull request #22778 from rahulhan/pkg_resource_unit_test
...
Adding pkg_resouce.py unit tests
2015-04-17 08:43:04 -06:00
Thomas S Hatch
6226d60abf
Merge pull request #22776 from The-Loeki/patch-1
...
Minor fix on clean
2015-04-17 08:42:58 -06:00
Thomas S Hatch
02a4c41ae1
Merge pull request #22769 from mgwilliams/lithium-utils-compat
...
add utils/compat.py
2015-04-17 08:42:21 -06:00
Thomas S Hatch
134d117eef
Merge pull request #22767 from mgwilliams/lithium-loader
...
loader: add missing import
2015-04-17 08:41:33 -06:00
Joseph Hall
7ee6103007
Adding and updating Stormpath modules
2015-04-17 08:37:23 -06:00
Tomas Sirny
42d26cc699
Shorter disk resource definition
2015-04-17 16:30:06 +02:00
Elias Probst
f31a75dcdc
Fixed typo/grammar.
2015-04-17 16:18:30 +02:00
Elias Probst
7b85666616
Fix alignment of code example.
2015-04-17 16:00:23 +02:00
Elias Probst
d685e49989
Added missing newline before code-block.
2015-04-17 16:00:23 +02:00
Tomas Sirny
cbc37d73c7
Merge branch 'cloud-gce-disks' of github.com:junckritter/salt into cloud-gce-disks
2015-04-17 15:43:58 +02:00
Tomas Sirny
5d93b7619d
Working test for extended profile
2015-04-17 15:40:08 +02:00
Tomas Sirny
6f34f0db74
Allow setting multiple disks and scopes on create of instance for GCE
2015-04-17 15:40:08 +02:00
Tomas Sirny
b1f6bd1824
Working test for extended profile
2015-04-17 15:28:09 +02:00
Rahul Handay
33da15b07b
Adding pkg_resouce.py unit tests
2015-04-17 17:52:13 +05:30
Jayesh Kariya
f5bb21cd3e
adding states/apache_module unit test case
2015-04-17 17:28:54 +05:30
Ronald van Zantvoort
e07c4803a6
Minor fix on clean
...
`re.match` matches from the start of the line, while we are actually looking for anywhere in the key ('system-serial' won't match on `match`, but will on `search`)
2015-04-17 13:23:31 +02:00
Jayesh Kariya
283899e939
adding states/alternatives unit test case
2015-04-17 15:26:36 +05:30
Daniel Nägele
f4fe028d80
smtp module: make multiple recipients work as expected
2015-04-17 10:59:50 +02:00
Jayesh Kariya
5905b03ed8
resolved errors.
2015-04-17 12:34:26 +05:30
Colton Myers
2210bd175e
Merge pull request #22668 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-04-16 23:22:36 -06:00
Matthew Williams
8db0ccf529
add utils/compat.py
2015-04-17 04:58:30 +00:00
Colton Myers
84c8ae5a77
Merge pull request #13 from rallytime/basepi-merge-forward-develop
...
Fully mock GPG mock class to allow gpg_tests to pass
2015-04-16 22:45:04 -06:00
Matthew Williams
53b0f0c93f
loader: add missing import
2015-04-17 04:34:40 +00:00
Justin Findlay
601e0ce012
Merge pull request #22764 from rallytime/pylint
...
Pylint fixes for develop
2015-04-16 22:31:51 -06:00
