pedro/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into 2.3

Browse source
This commit is contained in:
Nico Schottelius 2013-10-10 09:55:55 +09:00
commit 1c7f8baa02
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cdist/test/fixtures/remote/copy vendored
View file

@ -18,10 +18,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # 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 cp --dereference $code

2
other/examples/remote/local/copy
View file

@ -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 cp --dereference $code