Commit Graph

69438 Commits

Author SHA1 Message Date
Thomas S Hatch
5625827ee2 Merge pull request #36378 from terminalmage/issue36321
git.latest Treat an up-to-date checkout with local changes as up-to-date
2016-09-19 12:43:29 -06:00
Thomas S Hatch
a8a3a9f021 Merge pull request #36305 from gtmanfred/2016.3
cache query args with url as well
2016-09-19 12:30:51 -06:00
rallytime
c64e489f6f Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-19 11:22:54 -06:00
Jacob Hammons
9bc4eeb71e Fix typo (#36409) 2016-09-19 11:15:03 -06:00
Erik Johnson
ac5c812e4b Fix OS identification for CloudLinux (#36408) 2016-09-19 11:14:43 -06:00
twangboy
04c4ec4f81 Fix lint 2016-09-19 09:56:22 -06:00
Erik Johnson
bb4d69f58a git.latest: fail gracefully for misconfigured remote repo (#36391)
* git.latest: fail gracefully for misconfigured remote repo

When the remote repo's HEAD refers to a nonexistent ref, this was
causing a traceback when we tried to check if the upstream tracking
branch needed to be changed after cloning the repo. This commit fixes
this traceback by gracefully failing the state when the remote HEAD is
not present in the ``git ls-remote`` output, but the desired remote
revision doesn't exist.

Additionally, a similar graceful failure now happens if the state is run
again after we gracefully fail the first time, and we need to set the
tracking branch. Trying to set the tracking branch when there is no
local branch would fail with an ambiguous error like "fatal: branch
'master' does not exist", so before we even attempt to set the tracking
branch, the state is failed with a more descriptive comment.

* Add integration test for #36242
2016-09-19 09:33:00 -06:00
Thomas S Hatch
a3c0d4a0ab Add docstring 2016-09-19 09:03:03 -06:00
Oluwaseun Obajobi
966685020c fix accound_id in boto_iam and get_region in boto_sns 2016-09-18 16:30:34 +04:00
Erik Johnson
71b51f49ba Add integration tests for PR #35433 2016-09-17 22:55:47 -05:00
Erik Johnson
82515eccde Add an additional hint for cases where rev == 'HEAD' 2016-09-17 22:55:47 -05:00
Erik Johnson
4b7e2f9475 git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures
See https://github.com/saltstack/salt/issues/34790#issuecomment-238857462

This should help people understand the new behavior of the branch
parameter, when they run into non-fast-forward failures in git.latest
states when the remote rev differs from the name of the local branch.
2016-09-17 22:55:47 -05:00
Erik Johnson
7b1f621206 Fix git.latest test with local changes to reflect changes in state 2016-09-17 21:56:31 -05:00
Erik Johnson
0364fedb76 Use a single conditional 2016-09-17 21:17:23 -05:00
Mike Place
602bd2d1ef Merge pull request #36389 from cachedout/pr-36386
Pr 36386
2016-09-17 20:54:37 +09:00
Mike Place
f5d63d93cc
Lint 2016-09-17 20:53:41 +09:00
Mike Place
ad7045ad3b Merge pull request #36315 from puneetk/patch-6
No force_yes parameter to pkg.upgrade #21248
2016-09-17 19:34:34 +09:00
Mike Place
2aa6df859a Merge pull request #36381 from twangboy/fix_win_service
Add '/y' switch to the net stop and start commands
2016-09-17 18:59:58 +09:00
Mike Place
373c5db180 Merge pull request #36384 from twangboy/update_setup_req
Add windows requirements file
2016-09-17 18:27:13 +09:00
xiaoanyunfei
93269cfb65 fix salt-api log and pid 2016-09-17 09:53:16 +08:00
twangboy
a817aef1c2 Add windows requirements file 2016-09-16 15:43:36 -06:00
twangboy
04edea5c59 Add '/y' switch to the net stop and start commands 2016-09-16 15:07:26 -06:00
Erik Johnson
0dd1e7b53e git.latest Treat an up-to-date checkout with local changes as up-to-date
Implementation of https://github.com/saltstack/salt/issues/34725 caused
these cases to be seen as non-fast-forward changes, requiring
force_reset=True to proceed. This resolves that unintended behavior.

Fixes #36321.
2016-09-16 15:50:26 -05:00
twangboy
5789ea99cf Force string 2016-09-16 14:42:22 -06:00
twangboy
6c5bd7664b Fix join syntax 2016-09-16 14:41:35 -06:00
twangboy
ac8610d523 Add ServicePack to osrelease 2016-09-16 14:36:05 -06:00
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
Daniel Wallace
70e7f6d58b cache query args with url as well
Without this, we can't use query args to get the hash of a file or add
query args to change what a file returns
2016-09-16 15:32:45 -05:00
Nicole Thomas
495d365e54 Merge pull request #36369 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-09-16 10:31:14 -06:00
puneet kandhari
3ac308ac76 Update aptpkg.py 2016-09-16 11:22:11 -05:00
rallytime
37aea4188a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-16 09:24:17 -06:00
Thomas S Hatch
40b2e3d189 Merge pull request #36353 from rallytime/refresh-db-cleanup
Check for Ign/Hit membership instead of == in aptpkg.refresh_db
2016-09-16 09:20:30 -06:00
Nicole Thomas
df9d9b3624 Merge pull request #36355 from rallytime/bp-36288
Back-port #36288 to 2015.8
2016-09-16 08:59:47 -06:00
Denys Havrysh
3f308d7694 postgres_extension: report changes when an extension was installed (#36335)
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
2016-09-16 08:23:20 -06:00
twangboy
92034936c1 Fix windows grains for os 2016-09-15 17:46:16 -06:00
Mike Place
70ffdafbf0 Schema test requires jsonschema 2.5.0 or above 2016-09-15 17:23:51 -06:00
rallytime
275319193a Check for Ign/Hit membership instead of == in aptpkg.refresh_db 2016-09-15 16:46:28 -06:00
Michael Stella
ba60b7972a Additional documentation. 2016-09-15 17:22:08 -04:00
Michael Stella
8b877f014d 'All' grants for PostgreSQL.
This update allows granting privileges on ALL tables or ALL sequences
in a given schema.  Such as:

GRANT SELECT ON ALL TABLES IN SCHEMA public TO 'monkey';
2016-09-15 17:22:08 -04:00
Michael Stella
fbbe9ec571 Quote postgres privilege target names (#36249)
* Quote postgres privilege target names

Postgres lets you put characters in table/database names which you then must
quote.  So we should always quote.

* Updating unit tests

* Also quote role names.

Role names can also have dashes (or others) in them, so we must also quote
them.
2016-09-15 15:12:41 -06:00
Julien Cigar
9451141b3f set __virtualname__ to 'service' (#36330) 2016-09-15 14:53:09 -06:00
Thomas S Hatch
d2a583bc22 Merge pull request #36337 from cachedout/conduct
SaltStack's code of conduct
2016-09-15 14:44:25 -06:00
Julien BONACHERA
fee3be4d26 Use infoblox_* values if present in arguments (#36339) 2016-09-15 14:42:02 -06:00
Erik Johnson
ef128ad0b0 Return None when find_file identifies the path as a directory (#36342)
This fixes a traceback in the LocalClient when you try to use
cp.cache_file on a directory instead of a file.
2016-09-15 14:39:46 -06:00
Daniel Wallace
19eb84860e remove help message from glance module (#36345) 2016-09-15 14:38:42 -06:00
Nicole Thomas
a4bbd5e3d7 Add resize2fs unit test from blockdev_test to disk_test (#36346)
The blockdev module is being slowly deprecated and its functions moved to
to the disk module instead. There is a test for resize2fs in the blockdev_test
file in the 2015.8 branch (which matches the resize2fs function in the blockdev
module), but this function was moved to the disk file in 2016.3. The test was
never moved over.

I discovered this during a merge forward in #36344. This PR adds the
test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted
to work with the disk module accordingly.
2016-09-15 14:37:53 -06:00
Erik Johnson
f09c3e499f Merge pull request #36350 from terminalmage/docs
Add note about yumpkg.check_db removal in Boron
2016-09-15 15:32:31 -05:00
Erik Johnson
b815c98577 Add note about yumpkg.check_db removal in Boron
Resolves #36292.
2016-09-15 15:30:07 -05:00
puneet kandhari
892cc4cd48 Update aptpkg.py 2016-09-15 12:48:58 -05:00
Nicole Thomas
a33da842c0 Merge pull request #36344 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-09-15 11:38:57 -06:00