[sheepdog] [sheepdog/sheepdog] ea1f77: tests/functional: adapt to destructive update of p...

[Hitoshi Mitake]

  Branch: refs/heads/master
  Home:   https://github.com/sheepdog/sheepdog
  Commit: ea1f777e9bdbee681f2f028e393e8412f7364db6
      https://github.com/sheepdog/sheepdog/commit/ea1f777e9bdbee681f2f028e393e8412f7364db6
  Author: Meng Lingkun <menglingkun at cmss.chinamobile.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M tests/functional/common.config
    M tests/functional/common.rc

  Log Message:
  -----------
  tests/functional: adapt to destructive update of pgrep

As explained in commit 89f6b6a86ff50fe14a6c95b736a346f601d6418c, pgrep
has a destructive update. For sheep, it's better to support the two
different versions. This patch just does this in a simple and maybe
silly way.

Signed-off-by: Meng Lingkun <menglingkun at cmss.chinamobile.com>


  Commit: fbda77024f61d41634cc362a776dc52b5cf10f43
      https://github.com/sheepdog/sheepdog/commit/fbda77024f61d41634cc362a776dc52b5cf10f43
  Author: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M tests/functional/common.config
    M tests/functional/common.rc

  Log Message:
  -----------
  Merge branch 'smallpoorbird-master'


Compare: https://github.com/sheepdog/sheepdog/compare/9ada4f83dd40...fbda77024f61