From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 2 Jun 2016 15:23:41 +0000 (+0200)
Subject: Merge branch 'master' into website
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=12725aa3f218df819120197098c02cf2140fb3d0

Merge branch 'master' into website

* master: (30 commits)
  6.1.2
  bugfixes
  6.1.1
  critical change one of the hacks I had done for python3 turns out to severely break dealing with binary files revert that change for now; it's probably safer to use py2 only with this version, and a deeper fix will be needed later on
  nothing wrong with a stderr being not empty
  various cosmetic
  miscell cleanup and prettyfication in collector and application
  cosmetic
  6.1.0
  linux application receives a new attribute splitStderr defaults to False stdout and stderr are now merged by default in a single trace previous behaviour can be achieved by setting this new attribute to True
  cosmetic
  prettyfied execfuncs : mostly format vs %
  nicer output for the ssh command: show quotes only when needed
  prettyfied sshfuncs - no change
  6.0.9
  typo
  add a ${CODE} shorthand for linux applications, that refer to the full path of the (uploaded) code that was specified with code=
  linux/{node,application} only cosmetic and formatting use .format() instead of % should be harmless
  node.upload knows how to optionnally create executable files application.upload_code takes advantage of that -- this way we can upload a shell script usable as ${APP_HOME}/code
  revisited declaration of attributes for node and application
  ...

# Conflicts:
#	CHANGELOG.md
#	VERSION
---

12725aa3f218df819120197098c02cf2140fb3d0