Merge remote-tracking branch 'github/master' into 2.3
This commit is contained in:
commit
1c7f8baa02
2 changed files with 2 additions and 6 deletions
6
cdist/test/fixtures/remote/copy
vendored
6
cdist/test/fixtures/remote/copy
vendored
|
@ -18,10 +18,6 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
#
|
||||
# This is based on other/examples/remote/local/, but uses --dereference for the
|
||||
# test cases
|
||||
#
|
||||
|
||||
code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
|
||||
code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")"
|
||||
cp --dereference $code
|
||||
|
|
|
@ -20,5 +20,5 @@
|
|||
#
|
||||
#
|
||||
|
||||
code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
|
||||
code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")"
|
||||
cp --dereference $code
|
||||
|
|
Loading…
Reference in a new issue